aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ksz884x.c
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2010-05-13 06:06:01 -0400
committerDavid S. Miller <davem@davemloft.net>2010-05-18 01:55:10 -0400
commita05abcb5c912ce7127e5c638b490313e88541784 (patch)
tree61e14838288ff58dec164debd9b0ae222f44c723 /drivers/net/ksz884x.c
parent476c609e6eebe73e6038068b16a22238617b54a4 (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/ksz884x.c')
-rw-r--r--drivers/net/ksz884x.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ksz884x.c b/drivers/net/ksz884x.c
index cc0bc8a26085..c80ca64277b2 100644
--- a/drivers/net/ksz884x.c
+++ b/drivers/net/ksz884x.c
@@ -7049,10 +7049,9 @@ static int __init pcidev_init(struct pci_dev *pdev,
7049 mib_port_count = SWITCH_PORT_NUM; 7049 mib_port_count = SWITCH_PORT_NUM;
7050 } 7050 }
7051 hw->mib_port_cnt = TOTAL_PORT_NUM; 7051 hw->mib_port_cnt = TOTAL_PORT_NUM;
7052 hw->ksz_switch = kmalloc(sizeof(struct ksz_switch), GFP_KERNEL); 7052 hw->ksz_switch = kzalloc(sizeof(struct ksz_switch), GFP_KERNEL);
7053 if (!hw->ksz_switch) 7053 if (!hw->ksz_switch)
7054 goto pcidev_init_alloc_err; 7054 goto pcidev_init_alloc_err;
7055 memset(hw->ksz_switch, 0, sizeof(struct ksz_switch));
7056 7055
7057 sw = hw->ksz_switch; 7056 sw = hw->ksz_switch;
7058 } 7057 }