Commit 8c6a5dca authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

amd: use pci_zalloc_consistent 



Remove the now unnecessary memset too.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarDon Fry <pcnet32@frontier.com>
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 6850aeab

drivers/net/ethernet/amd/pcnet32.c

+8 −10
Original line number Diff line number Diff line
@@ -484,7 +484,7 @@ static void pcnet32_realloc_tx_ring(struct net_device *dev, 


	pcnet32_purge_tx_ring(dev);



	new_tx_ring = pci_alloc_consistent(lp->pci_dev,

	new_tx_ring = pci_zalloc_consistent(lp->pci_dev,

					    sizeof(struct pcnet32_tx_head) *

					    (1 << size),

					    &new_ring_dma_addr);
@@ -492,7 +492,6 @@ static void pcnet32_realloc_tx_ring(struct net_device *dev, 
		netif_err(lp, drv, dev, "Consistent memory allocation failed\n");

		return;

	}

	memset(new_tx_ring, 0, sizeof(struct pcnet32_tx_head) * (1 << size));



	new_dma_addr_list = kcalloc(1 << size, sizeof(dma_addr_t),

				    GFP_ATOMIC);
@@ -551,7 +550,7 @@ static void pcnet32_realloc_rx_ring(struct net_device *dev, 
	int new, overlap;

	unsigned int entries = 1 << size;



	new_rx_ring = pci_alloc_consistent(lp->pci_dev,

	new_rx_ring = pci_zalloc_consistent(lp->pci_dev,

					    sizeof(struct pcnet32_rx_head) *

					    entries,

					    &new_ring_dma_addr);
@@ -559,7 +558,6 @@ static void pcnet32_realloc_rx_ring(struct net_device *dev, 
		netif_err(lp, drv, dev, "Consistent memory allocation failed\n");

		return;

	}

	memset(new_rx_ring, 0, sizeof(struct pcnet32_rx_head) * entries);



	new_dma_addr_list = kcalloc(entries, sizeof(dma_addr_t), GFP_ATOMIC);

	if (!new_dma_addr_list)

CRA Git | Maintained and supported by SUSTech CRA and CCSE