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>

1 files changed, 4 insertions, 8 deletions

diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
index 39ab4d09faaa..4bdca9ec6a1a 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
@@ -1469,12 +1469,11 @@ pch_gbe_alloc_rx_buffers_pool(struct pch_gbe_adapter *adapter,
 
         size = rx_ring->count * bufsz + PCH_GBE_RESERVE_MEMORY;
         rx_ring->rx_buff_pool = dma_alloc_coherent(&pdev->dev, size,
-                                                &rx_ring->rx_buff_pool_logic,
-                                                GFP_KERNEL);
-        if (!rx_ring->rx_buff_pool) {
-                pr_err("Unable to allocate memory for the receive pool buffer\n");
+                                                   &rx_ring->rx_buff_pool_logic,
+                                                   GFP_KERNEL);
+        if (!rx_ring->rx_buff_pool)
                 return -ENOMEM;
-        }
+
         memset(rx_ring->rx_buff_pool, 0, size);
         rx_ring->rx_buff_pool_size = size;
         for (i = 0; i < rx_ring->count; i++) {
@@ -1777,7 +1776,6 @@ int pch_gbe_setup_tx_resources(struct pch_gbe_adapter *adapter,
                                            &tx_ring->dma, GFP_KERNEL);
         if (!tx_ring->desc) {
                 vfree(tx_ring->buffer_info);
-                pr_err("Unable to allocate memory for the transmit descriptor ring\n");
                 return -ENOMEM;
         }
         memset(tx_ring->desc, 0, tx_ring->size);
@@ -1821,9 +1819,7 @@ int pch_gbe_setup_rx_resources(struct pch_gbe_adapter *adapter,
         rx_ring->size = rx_ring->count * (int)sizeof(struct pch_gbe_rx_desc);
         rx_ring->desc = dma_alloc_coherent(&pdev->dev, rx_ring->size,
                                            &rx_ring->dma, GFP_KERNEL);
-
         if (!rx_ring->desc) {
-                pr_err("Unable to allocate memory for the receive descriptor ring\n");
                 vfree(rx_ring->buffer_info);
                 return -ENOMEM;
         }