]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Staging: hv: Transform some kzalloc calls to kcalloc
authorNicolas Palix <npalix@diku.dk>
Wed, 22 Jul 2009 13:39:13 +0000 (15:39 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 15 Sep 2009 19:01:49 +0000 (12:01 -0700)
Here is a short excerpt of the semantic patch performing
this transformation:
(http://www.emn.fr/x-info/coccinelle/)

//<smpl>
@@
expression E1,E2,E3;
@@
- kzalloc(E1*sizeof(E2),E3)
+ kcalloc(E1,sizeof(E2),E3)

@@
expression E1,E3;
type T;
@@
- kzalloc(E1*sizeof(T),E3)
+ kcalloc(E1,sizeof(T),E3)
//</smpl>

Signed-off-by: Nicolas Palix <npalix@diku.dk>
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/hv/storvsc_drv.c

index 62aeb2756617ef6e18ff41dbe2db0e129ff6a7c1..b4a82eb001e1ea9449dc8c9e54bbd23ded81d08c 100644 (file)
@@ -473,7 +473,7 @@ static struct scatterlist *create_bounce_buffer(struct scatterlist *sgl, unsigne
 
        num_pages = ALIGN_UP(len, PAGE_SIZE) >> PAGE_SHIFT;
 
-       bounce_sgl = kzalloc(num_pages * sizeof(struct scatterlist), GFP_ATOMIC);
+       bounce_sgl = kcalloc(num_pages, sizeof(struct scatterlist), GFP_ATOMIC);
        if (!bounce_sgl)
        {
                return NULL;
@@ -928,14 +928,14 @@ static void storvsc_host_rescan_callback(struct work_struct *work)
        DPRINT_ENTER(STORVSC_DRV);
 
        host_device_ctx = (struct host_device_context*)host->hostdata;
-       lun_list = kzalloc(sizeof(unsigned int)*STORVSC_MAX_LUNS_PER_TARGET, GFP_ATOMIC);
+       lun_list = kcalloc(STORVSC_MAX_LUNS_PER_TARGET, sizeof(unsigned int), GFP_ATOMIC);
        if (!lun_list)
        {
                DPRINT_ERR(STORVSC_DRV, "unable to allocate lun list");
                return;
        }
 
-       sdevs_remove_list = kzalloc(sizeof(void*)*STORVSC_MAX_LUNS_PER_TARGET, GFP_ATOMIC);
+       sdevs_remove_list = kcalloc(STORVSC_MAX_LUNS_PER_TARGET, sizeof(void *), GFP_ATOMIC);
        if (!sdevs_remove_list)
        {
                kfree(lun_list);