lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] sky2: use kzalloc

Browse Source 
Can use kzalloc to save a little code.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
shemminger@osdl.org
2005-10-26 12:16:08 -07:00
committed by Jeff Garzik
parent 488f84fd90
commit b2f5ad4fec
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/sky2.c
View File

@@ -910,12 +910,11 @@ static int sky2_up(struct net_device *dev)
if (!sky2->tx_le) if (!sky2->tx_le)
goto err_out; 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); GFP_KERNEL);
if (!sky2->tx_ring) if (!sky2->tx_ring)
goto err_out; goto err_out;
sky2->tx_prod = sky2->tx_cons = 0; 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 = pci_alloc_consistent(hw->pdev, RX_LE_BYTES,
&sky2->rx_le_map); &sky2->rx_le_map);
@@ -923,7 +922,7 @@ static int sky2_up(struct net_device *dev)
goto err_out; goto err_out;
memset(sky2->rx_le, 0, RX_LE_BYTES); 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); GFP_KERNEL);
if (!sky2->rx_ring) if (!sky2->rx_ring)
goto err_out; goto err_out;