Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/ethernet/marvell/sky2.c

+2 −3
Original line number Diff line number Diff line
@@ -1622,11 +1622,10 @@ static int sky2_alloc_buffers(struct sky2_port *sky2) 
	if (!sky2->tx_ring)

		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);

	if (!sky2->rx_le)

		goto nomem;

	memset(sky2->rx_le, 0, RX_LE_BYTES);



	sky2->rx_ring = kcalloc(sky2->rx_pending, sizeof(struct rx_ring_info),

				GFP_KERNEL);