Skip to content

Commit

Permalink
drivers/net: Use kcalloc or kzalloc
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Julia Lawall authored and David S. Miller committed May 18, 2010
1 parent 476c609 commit a05abcb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 1 addition & 2 deletions drivers/net/ibmveth.c
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ static int ibmveth_alloc_buffer_pool(struct ibmveth_buff_pool *pool)
return -1;
}

pool->skbuff = kmalloc(sizeof(void*) * pool->size, GFP_KERNEL);
pool->skbuff = kcalloc(pool->size, sizeof(void *), GFP_KERNEL);

if(!pool->skbuff) {
kfree(pool->dma_addr);
Expand All @@ -211,7 +211,6 @@ static int ibmveth_alloc_buffer_pool(struct ibmveth_buff_pool *pool)
return -1;
}

memset(pool->skbuff, 0, sizeof(void*) * pool->size);
memset(pool->dma_addr, 0, sizeof(dma_addr_t) * pool->size);

for(i = 0; i < pool->size; ++i) {
Expand Down
3 changes: 1 addition & 2 deletions drivers/net/ksz884x.c
Original file line number Diff line number Diff line change
Expand Up @@ -7049,10 +7049,9 @@ static int __init pcidev_init(struct pci_dev *pdev,
mib_port_count = SWITCH_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)
goto pcidev_init_alloc_err;
memset(hw->ksz_switch, 0, sizeof(struct ksz_switch));

sw = hw->ksz_switch;
}
Expand Down

0 comments on commit a05abcb

Please sign in to comment.