drivers:net: dma_alloc_coherent: use __GFP_ZERO instead of memset(, 0)

Reduce the number of calls required to alloc
a zeroed block of memory.

Trivially reduces overall object size.

Other changes around these removals
o Neaten call argument alignment
o Remove an unnecessary OOM message after dma_alloc_coherent failure
o Remove unnecessary gfp_t stack variable

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 3 insertions, 8 deletions

diff --git a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
index 43462d596a4e..a9f9c7906769 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
@@ -1020,12 +1020,11 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
         txdr->size = txdr->count * sizeof(struct e1000_tx_desc);
         txdr->size = ALIGN(txdr->size, 4096);
         txdr->desc = dma_alloc_coherent(&pdev->dev, txdr->size, &txdr->dma,
-                                        GFP_KERNEL);
+                                        GFP_KERNEL | __GFP_ZERO);
         if (!txdr->desc) {
                 ret_val = 2;
                 goto err_nomem;
         }
-        memset(txdr->desc, 0, txdr->size);
         txdr->next_to_use = txdr->next_to_clean = 0;
 
         ew32(TDBAL, ((u64)txdr->dma & 0x00000000FFFFFFFF));
@@ -1075,12 +1074,11 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
 
         rxdr->size = rxdr->count * sizeof(struct e1000_rx_desc);
         rxdr->desc = dma_alloc_coherent(&pdev->dev, rxdr->size, &rxdr->dma,
-                                        GFP_KERNEL);
+                                        GFP_KERNEL | __GFP_ZERO);
         if (!rxdr->desc) {
                 ret_val = 5;
                 goto err_nomem;
         }
-        memset(rxdr->desc, 0, rxdr->size);
         rxdr->next_to_use = rxdr->next_to_clean = 0;
 
         rctl = er32(RCTL);
diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
index d60cd4393415..bea46bb26061 100644
--- a/drivers/net/ethernet/intel/igbvf/netdev.c
+++ b/drivers/net/ethernet/intel/igbvf/netdev.c
@@ -447,7 +447,6 @@ int igbvf_setup_tx_resources(struct igbvf_adapter *adapter,
 
         tx_ring->desc = dma_alloc_coherent(&pdev->dev, tx_ring->size,
                                            &tx_ring->dma, GFP_KERNEL);
-
         if (!tx_ring->desc)
                 goto err;
 
@@ -488,7 +487,6 @@ int igbvf_setup_rx_resources(struct igbvf_adapter *adapter,
 
         rx_ring->desc = dma_alloc_coherent(&pdev->dev, rx_ring->size,
                                            &rx_ring->dma, GFP_KERNEL);
-
         if (!rx_ring->desc)
                 goto err;
 
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
index e23f0234cb27..74464c348454 100644
--- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
@@ -717,12 +717,11 @@ ixgb_setup_tx_resources(struct ixgb_adapter *adapter)
         txdr->size = ALIGN(txdr->size, 4096);
 
         txdr->desc = dma_alloc_coherent(&pdev->dev, txdr->size, &txdr->dma,
-                                        GFP_KERNEL);
+                                        GFP_KERNEL | __GFP_ZERO);
         if (!txdr->desc) {
                 vfree(txdr->buffer_info);
                 return -ENOMEM;
         }
-        memset(txdr->desc, 0, txdr->size);
 
         txdr->next_to_use = 0;
         txdr->next_to_clean = 0;