Commit 12fe08b2 authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds

sky2: use pci_zalloc_consistent

Remove the now unnecessary memset too.
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Cc: Mirko Lindner <mlindner@marvell.com>
Cc: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 87f44b4e
...@@ -1622,11 +1622,10 @@ static int sky2_alloc_buffers(struct sky2_port *sky2) ...@@ -1622,11 +1622,10 @@ static int sky2_alloc_buffers(struct sky2_port *sky2)
if (!sky2->tx_ring) if (!sky2->tx_ring)
goto nomem; goto nomem;
sky2->rx_le = pci_alloc_consistent(hw->pdev, RX_LE_BYTES, sky2->rx_le = pci_zalloc_consistent(hw->pdev, RX_LE_BYTES,
&sky2->rx_le_map); &sky2->rx_le_map);
if (!sky2->rx_le) if (!sky2->rx_le)
goto nomem; goto nomem;
memset(sky2->rx_le, 0, RX_LE_BYTES);
sky2->rx_ring = kcalloc(sky2->rx_pending, sizeof(struct rx_ring_info), sky2->rx_ring = kcalloc(sky2->rx_pending, sizeof(struct rx_ring_info),
GFP_KERNEL); GFP_KERNEL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment