diff options
Diffstat (limited to 'drivers/net/ethernet/intel')
-rw-r--r-- | drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 8 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/netdev.c | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_main.c | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgb/ixgb_main.c | 8 |
4 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c index 2569a168334c..a41008523c98 100644 --- a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c +++ b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c | |||
@@ -993,8 +993,8 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter) | |||
993 | 993 | ||
994 | txdr->size = txdr->count * sizeof(struct e1000_tx_desc); | 994 | txdr->size = txdr->count * sizeof(struct e1000_tx_desc); |
995 | txdr->size = ALIGN(txdr->size, 4096); | 995 | txdr->size = ALIGN(txdr->size, 4096); |
996 | txdr->desc = dma_zalloc_coherent(&pdev->dev, txdr->size, &txdr->dma, | 996 | txdr->desc = dma_alloc_coherent(&pdev->dev, txdr->size, &txdr->dma, |
997 | GFP_KERNEL); | 997 | GFP_KERNEL); |
998 | if (!txdr->desc) { | 998 | if (!txdr->desc) { |
999 | ret_val = 2; | 999 | ret_val = 2; |
1000 | goto err_nomem; | 1000 | goto err_nomem; |
@@ -1051,8 +1051,8 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter) | |||
1051 | } | 1051 | } |
1052 | 1052 | ||
1053 | rxdr->size = rxdr->count * sizeof(struct e1000_rx_desc); | 1053 | rxdr->size = rxdr->count * sizeof(struct e1000_rx_desc); |
1054 | rxdr->desc = dma_zalloc_coherent(&pdev->dev, rxdr->size, &rxdr->dma, | 1054 | rxdr->desc = dma_alloc_coherent(&pdev->dev, rxdr->size, &rxdr->dma, |
1055 | GFP_KERNEL); | 1055 | GFP_KERNEL); |
1056 | if (!rxdr->desc) { | 1056 | if (!rxdr->desc) { |
1057 | ret_val = 6; | 1057 | ret_val = 6; |
1058 | goto err_nomem; | 1058 | goto err_nomem; |
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 308c006cb41d..189f231075c2 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c | |||
@@ -2305,8 +2305,8 @@ static int e1000_alloc_ring_dma(struct e1000_adapter *adapter, | |||
2305 | { | 2305 | { |
2306 | struct pci_dev *pdev = adapter->pdev; | 2306 | struct pci_dev *pdev = adapter->pdev; |
2307 | 2307 | ||
2308 | ring->desc = dma_zalloc_coherent(&pdev->dev, ring->size, &ring->dma, | 2308 | ring->desc = dma_alloc_coherent(&pdev->dev, ring->size, &ring->dma, |
2309 | GFP_KERNEL); | 2309 | GFP_KERNEL); |
2310 | if (!ring->desc) | 2310 | if (!ring->desc) |
2311 | return -ENOMEM; | 2311 | return -ENOMEM; |
2312 | 2312 | ||
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index 4d40878e395a..f52e2c46e6a7 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c | |||
@@ -109,8 +109,8 @@ int i40e_allocate_dma_mem_d(struct i40e_hw *hw, struct i40e_dma_mem *mem, | |||
109 | struct i40e_pf *pf = (struct i40e_pf *)hw->back; | 109 | struct i40e_pf *pf = (struct i40e_pf *)hw->back; |
110 | 110 | ||
111 | mem->size = ALIGN(size, alignment); | 111 | mem->size = ALIGN(size, alignment); |
112 | mem->va = dma_zalloc_coherent(&pf->pdev->dev, mem->size, | 112 | mem->va = dma_alloc_coherent(&pf->pdev->dev, mem->size, &mem->pa, |
113 | &mem->pa, GFP_KERNEL); | 113 | GFP_KERNEL); |
114 | if (!mem->va) | 114 | if (!mem->va) |
115 | return -ENOMEM; | 115 | return -ENOMEM; |
116 | 116 | ||
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c index 1d4d1686909a..e5ac2d3fd816 100644 --- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c +++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c | |||
@@ -680,8 +680,8 @@ ixgb_setup_tx_resources(struct ixgb_adapter *adapter) | |||
680 | txdr->size = txdr->count * sizeof(struct ixgb_tx_desc); | 680 | txdr->size = txdr->count * sizeof(struct ixgb_tx_desc); |
681 | txdr->size = ALIGN(txdr->size, 4096); | 681 | txdr->size = ALIGN(txdr->size, 4096); |
682 | 682 | ||
683 | txdr->desc = dma_zalloc_coherent(&pdev->dev, txdr->size, &txdr->dma, | 683 | txdr->desc = dma_alloc_coherent(&pdev->dev, txdr->size, &txdr->dma, |
684 | GFP_KERNEL); | 684 | GFP_KERNEL); |
685 | if (!txdr->desc) { | 685 | if (!txdr->desc) { |
686 | vfree(txdr->buffer_info); | 686 | vfree(txdr->buffer_info); |
687 | return -ENOMEM; | 687 | return -ENOMEM; |
@@ -763,8 +763,8 @@ ixgb_setup_rx_resources(struct ixgb_adapter *adapter) | |||
763 | rxdr->size = rxdr->count * sizeof(struct ixgb_rx_desc); | 763 | rxdr->size = rxdr->count * sizeof(struct ixgb_rx_desc); |
764 | rxdr->size = ALIGN(rxdr->size, 4096); | 764 | rxdr->size = ALIGN(rxdr->size, 4096); |
765 | 765 | ||
766 | rxdr->desc = dma_zalloc_coherent(&pdev->dev, rxdr->size, &rxdr->dma, | 766 | rxdr->desc = dma_alloc_coherent(&pdev->dev, rxdr->size, &rxdr->dma, |
767 | GFP_KERNEL); | 767 | GFP_KERNEL); |
768 | 768 | ||
769 | if (!rxdr->desc) { | 769 | if (!rxdr->desc) { |
770 | vfree(rxdr->buffer_info); | 770 | vfree(rxdr->buffer_info); |