lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drivers/net: Use kcalloc or kzalloc

Browse Source 
Use kcalloc or kzalloc rather than the combination of kmalloc and memset.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
expression x,y,flags;
statement S;
type T;
@@

x =
-   kmalloc
+   kcalloc
           (
-           y * sizeof(T),
+           y, sizeof(T),
                flags);
 if (x == NULL) S
-memset(x, 0, y * sizeof(T));

@@
expression x,size,flags;
statement S;
@@

-x = kmalloc(size,flags);
+x = kzalloc(size,flags);
 if (x == NULL) S
-memset(x, 0, size);
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Julia Lawall
2010-05-13 10:06:01 +00:00
committed by David S. Miller
parent 476c609e6e
commit a05abcb5c9
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/ibmveth.c
View File

@@ -200,7 +200,7 @@ static int ibmveth_alloc_buffer_pool(struct ibmveth_buff_pool *pool)
return -1; return -1;
} }
pool->skbuff = kmalloc(sizeof(void*) * pool->size, GFP_KERNEL); pool->skbuff = kcalloc(pool->size, sizeof(void *), GFP_KERNEL);
if(!pool->skbuff) { if(!pool->skbuff) {
kfree(pool->dma_addr); kfree(pool->dma_addr);
@@ -211,7 +211,6 @@ static int ibmveth_alloc_buffer_pool(struct ibmveth_buff_pool *pool)
return -1; return -1;
} }
memset(pool->skbuff, 0, sizeof(void*) * pool->size);
memset(pool->dma_addr, 0, sizeof(dma_addr_t) * pool->size); memset(pool->dma_addr, 0, sizeof(dma_addr_t) * pool->size);
for(i = 0; i < pool->size; ++i) { for(i = 0; i < pool->size; ++i) {

3
drivers/net/ksz884x.c
View File

@@ -7049,10 +7049,9 @@ static int __init pcidev_init(struct pci_dev *pdev,
mib_port_count = SWITCH_PORT_NUM; mib_port_count = SWITCH_PORT_NUM;
} }
hw->mib_port_cnt = TOTAL_PORT_NUM; hw->mib_port_cnt = TOTAL_PORT_NUM;
hw->ksz_switch = kmalloc(sizeof(struct ksz_switch), GFP_KERNEL); hw->ksz_switch = kzalloc(sizeof(struct ksz_switch), GFP_KERNEL);
if (!hw->ksz_switch) if (!hw->ksz_switch)
goto pcidev_init_alloc_err; goto pcidev_init_alloc_err;
memset(hw->ksz_switch, 0, sizeof(struct ksz_switch));
sw = hw->ksz_switch; sw = hw->ksz_switch;
} }