summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshemminger@osdl.org <shemminger@osdl.org>2005-10-26 12:16:08 -0700
committerJeff Garzik <jgarzik@pobox.com>2005-10-28 12:18:52 -0400
commitb2f5ad4fec76e78103e7fbb4e808587ea8a6d824 (patch)
tree54d767fefe3be4e4c746e0b224131dc0ccbbb588
parent488f84fd901cd3386f5723a3573ea2e1f55af537 (diff)
[PATCH] sky2: use kzalloc
Can use kzalloc to save a little code. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
-rw-r--r--drivers/net/sky2.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 06beb71cb3c..f5b101bf469 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -910,12 +910,11 @@ static int sky2_up(struct net_device *dev)
if (!sky2->tx_le)
goto err_out;
- sky2->tx_ring = kmalloc(TX_RING_SIZE * sizeof(struct ring_info),
+ sky2->tx_ring = kzalloc(TX_RING_SIZE * sizeof(struct ring_info),
GFP_KERNEL);
if (!sky2->tx_ring)
goto err_out;
sky2->tx_prod = sky2->tx_cons = 0;
- memset(sky2->tx_ring, 0, TX_RING_SIZE * sizeof(struct ring_info));
sky2->rx_le = pci_alloc_consistent(hw->pdev, RX_LE_BYTES,
&sky2->rx_le_map);
@@ -923,7 +922,7 @@ static int sky2_up(struct net_device *dev)
goto err_out;
memset(sky2->rx_le, 0, RX_LE_BYTES);
- sky2->rx_ring = kmalloc(sky2->rx_pending * sizeof(struct ring_info),
+ sky2->rx_ring = kzalloc(sky2->rx_pending * sizeof(struct ring_info),
GFP_KERNEL);
if (!sky2->rx_ring)
goto err_out;