drivers:net: Remove dma_alloc_coherent OOM messages

I believe these error messages are already logged
on allocation failure by warn_alloc_failed and so
get a dump_stack on OOM.

Remove the unnecessary additional error logging.

Around these deletions:

o Alignment neatening.
o Remove unnecessary casts of dma_alloc_coherent.
o Hoist assigns from ifs.

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

3 files changed, 0 insertions, 14 deletions

diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index 8502c625dbef..d98e1d0996d4 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -1516,8 +1516,6 @@ static int e1000_setup_tx_resources(struct e1000_adapter *adapter,
         if (!txdr->desc) {
 setup_tx_desc_die:
                 vfree(txdr->buffer_info);
-                e_err(probe, "Unable to allocate memory for the Tx descriptor "
-                      "ring\n");
                 return -ENOMEM;
         }
 
@@ -1707,10 +1705,7 @@ static int e1000_setup_rx_resources(struct e1000_adapter *adapter,
 
         rxdr->desc = dma_alloc_coherent(&pdev->dev, rxdr->size, &rxdr->dma,
                                         GFP_KERNEL);
-
         if (!rxdr->desc) {
-                e_err(probe, "Unable to allocate memory for the Rx descriptor "
-                      "ring\n");
 setup_rx_desc_die:
                 vfree(rxdr->buffer_info);
                 return -ENOMEM;
@@ -1729,8 +1724,6 @@ setup_rx_desc_die:
                 if (!rxdr->desc) {
                         dma_free_coherent(&pdev->dev, rxdr->size, olddesc,
                                           olddma);
-                        e_err(probe, "Unable to allocate memory for the Rx "
-                              "descriptor ring\n");
                         goto setup_rx_desc_die;
                 }
 
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
index ea4808373435..e23f0234cb27 100644
--- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
@@ -720,8 +720,6 @@ ixgb_setup_tx_resources(struct ixgb_adapter *adapter)
                                         GFP_KERNEL);
         if (!txdr->desc) {
                 vfree(txdr->buffer_info);
-                netif_err(adapter, probe, adapter->netdev,
-                          "Unable to allocate transmit descriptor memory\n");
                 return -ENOMEM;
         }
         memset(txdr->desc, 0, txdr->size);
@@ -807,8 +805,6 @@ ixgb_setup_rx_resources(struct ixgb_adapter *adapter)
 
         if (!rxdr->desc) {
                 vfree(rxdr->buffer_info);
-                netif_err(adapter, probe, adapter->netdev,
-                          "Unable to allocate receive descriptors\n");
                 return -ENOMEM;
         }
         memset(rxdr->desc, 0, rxdr->size);
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 2635b8303515..ac0c315659de 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -2423,9 +2423,6 @@ int ixgbevf_setup_rx_resources(struct ixgbevf_adapter *adapter,
                                            &rx_ring->dma, GFP_KERNEL);
 
         if (!rx_ring->desc) {
-                hw_dbg(&adapter->hw,
-                       "Unable to allocate memory for "
-                       "the receive descriptor ring\n");
                 vfree(rx_ring->rx_buffer_info);
                 rx_ring->rx_buffer_info = NULL;
                 goto alloc_failed;