evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

atl1e: use pci_zalloc_consistent

Browse source 
Remove the now unnecessary memset too.

Signed-off-by: Joe Perches <joe@perches.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:25 -07:00 • committed by Linus Torvalds
parent 8c6a5dca88
commit 191182688a
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/net/ethernet/atheros/atl1e/atl1e_main.c
View file

@ -831,17 +831,14 @@ static int atl1e_setup_ring_resources(struct atl1e_adapter *adapter)
/* real ring DMA buffer */ /* real ring DMA buffer */
size = adapter->ring_size; size = adapter->ring_size;
adapter->ring_vir_addr = pci_alloc_consistent(pdev, adapter->ring_vir_addr = pci_zalloc_consistent(pdev, adapter->ring_size,
adapter->ring_size, &adapter->ring_dma); &adapter->ring_dma);
if (adapter->ring_vir_addr == NULL) { if (adapter->ring_vir_addr == NULL) {
netdev_err(adapter->netdev, netdev_err(adapter->netdev,
"pci_alloc_consistent failed, size = D%d\n", size); "pci_alloc_consistent failed, size = D%d\n", size);
return -ENOMEM; return -ENOMEM;
} }
memset(adapter->ring_vir_addr, 0, adapter->ring_size);
rx_page_desc = rx_ring->rx_page_desc; rx_page_desc = rx_ring->rx_page_desc;
/* Init TPD Ring */ /* Init TPD Ring */