diff options
author | Julia Lawall <julia@diku.dk> | 2010-05-13 06:06:01 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-05-18 01:55:10 -0400 |
commit | a05abcb5c912ce7127e5c638b490313e88541784 (patch) | |
tree | 61e14838288ff58dec164debd9b0ae222f44c723 /drivers/net/ibmveth.c | |
parent | 476c609e6eebe73e6038068b16a22238617b54a4 (diff) |
drivers/net: Use kcalloc or kzalloc
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>
Diffstat (limited to 'drivers/net/ibmveth.c')
-rw-r--r-- | drivers/net/ibmveth.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c index 941be84deb67..7acb3edc47ef 100644 --- a/drivers/net/ibmveth.c +++ b/drivers/net/ibmveth.c | |||
@@ -200,7 +200,7 @@ static int ibmveth_alloc_buffer_pool(struct ibmveth_buff_pool *pool) | |||
200 | return -1; | 200 | return -1; |
201 | } | 201 | } |
202 | 202 | ||
203 | pool->skbuff = kmalloc(sizeof(void*) * pool->size, GFP_KERNEL); | 203 | pool->skbuff = kcalloc(pool->size, sizeof(void *), GFP_KERNEL); |
204 | 204 | ||
205 | if(!pool->skbuff) { | 205 | if(!pool->skbuff) { |
206 | kfree(pool->dma_addr); | 206 | kfree(pool->dma_addr); |
@@ -211,7 +211,6 @@ static int ibmveth_alloc_buffer_pool(struct ibmveth_buff_pool *pool) | |||
211 | return -1; | 211 | return -1; |
212 | } | 212 | } |
213 | 213 | ||
214 | memset(pool->skbuff, 0, sizeof(void*) * pool->size); | ||
215 | memset(pool->dma_addr, 0, sizeof(dma_addr_t) * pool->size); | 214 | memset(pool->dma_addr, 0, sizeof(dma_addr_t) * pool->size); |
216 | 215 | ||
217 | for(i = 0; i < pool->size; ++i) { | 216 | for(i = 0; i < pool->size; ++i) { |