aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2010-05-13 06:05:40 -0400
committerDavid S. Miller <davem@davemloft.net>2010-05-18 01:55:10 -0400
commit476c609e6eebe73e6038068b16a22238617b54a4 (patch)
treec87945b8a15c7aa6002eb14b4277f2110d3e8319 /drivers/net
parent49afa55b5bd792cda4fca15d3238e9b6f370c856 (diff)
drivers/net/vmxnet3: Use kzalloc
Use 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,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: Bhavesh Davda <bhavesh@vmware.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/vmxnet3/vmxnet3_drv.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index 39462321f5fb..989b742551ac 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -1369,13 +1369,12 @@ vmxnet3_rq_create(struct vmxnet3_rx_queue *rq, struct vmxnet3_adapter *adapter)
1369 1369
1370 sz = sizeof(struct vmxnet3_rx_buf_info) * (rq->rx_ring[0].size + 1370 sz = sizeof(struct vmxnet3_rx_buf_info) * (rq->rx_ring[0].size +
1371 rq->rx_ring[1].size); 1371 rq->rx_ring[1].size);
1372 bi = kmalloc(sz, GFP_KERNEL); 1372 bi = kzalloc(sz, GFP_KERNEL);
1373 if (!bi) { 1373 if (!bi) {
1374 printk(KERN_ERR "%s: failed to allocate rx bufinfo\n", 1374 printk(KERN_ERR "%s: failed to allocate rx bufinfo\n",
1375 adapter->netdev->name); 1375 adapter->netdev->name);
1376 goto err; 1376 goto err;
1377 } 1377 }
1378 memset(bi, 0, sz);
1379 rq->buf_info[0] = bi; 1378 rq->buf_info[0] = bi;
1380 rq->buf_info[1] = bi + rq->rx_ring[0].size; 1379 rq->buf_info[1] = bi + rq->rx_ring[0].size;
1381 1380