leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

amd: use pci_zalloc_consistent

Browse Source 
Remove the now unnecessary memset too.

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Don Fry <pcnet32@frontier.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Joe Perches 2014-08-08 14:24:23 -07:00 committed by Linus Torvalds
parent 6850aeabdd
commit 8c6a5dca88
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/ethernet/amd/pcnet32.c
View File

@ -484,15 +484,14 @@ static void pcnet32_realloc_tx_ring(struct net_device *dev,
pcnet32_purge_tx_ring(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) * sizeof(struct pcnet32_tx_head) *
(1 << size), (1 << size),
&new_ring_dma_addr); &new_ring_dma_addr);
if (new_tx_ring == NULL) { if (new_tx_ring == NULL) {
netif_err(lp, drv, dev, "Consistent memory allocation failed\n"); netif_err(lp, drv, dev, "Consistent memory allocation failed\n");
return; return;
} }
memset(new_tx_ring, 0, sizeof(struct pcnet32_tx_head) * (1 << size));
new_dma_addr_list = kcalloc(1 << size, sizeof(dma_addr_t), new_dma_addr_list = kcalloc(1 << size, sizeof(dma_addr_t),
GFP_ATOMIC); GFP_ATOMIC);
@ -551,15 +550,14 @@ static void pcnet32_realloc_rx_ring(struct net_device *dev,
int new, overlap; int new, overlap;
unsigned int entries = 1 << size; 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) * sizeof(struct pcnet32_rx_head) *
entries, entries,
&new_ring_dma_addr); &new_ring_dma_addr);
if (new_rx_ring == NULL) { if (new_rx_ring == NULL) {
netif_err(lp, drv, dev, "Consistent memory allocation failed\n"); netif_err(lp, drv, dev, "Consistent memory allocation failed\n");
return; return;
} }
memset(new_rx_ring, 0, sizeof(struct pcnet32_rx_head) * entries);
new_dma_addr_list = kcalloc(entries, sizeof(dma_addr_t), GFP_ATOMIC); new_dma_addr_list = kcalloc(entries, sizeof(dma_addr_t), GFP_ATOMIC);
if (!new_dma_addr_list) if (!new_dma_addr_list)