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, 8 insertions, 16 deletions

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 39c6c5524633..d02b446037d7 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -534,25 +534,17 @@ static void init_dma_desc_rings(struct net_device *dev)
                                             GFP_KERNEL);
         priv->rx_skbuff = kmalloc_array(rxsize, sizeof(struct sk_buff *),
                                         GFP_KERNEL);
-        priv->dma_rx =
-            (struct dma_desc *)dma_alloc_coherent(priv->device,
-                                                  rxsize *
-                                                  sizeof(struct dma_desc),
-                                                  &priv->dma_rx_phy,
-                                                  GFP_KERNEL);
+        priv->dma_rx = dma_alloc_coherent(priv->device,
+                                          rxsize * sizeof(struct dma_desc),
+                                          &priv->dma_rx_phy, GFP_KERNEL);
         priv->tx_skbuff = kmalloc_array(txsize, sizeof(struct sk_buff *),
                                         GFP_KERNEL);
-        priv->dma_tx =
-            (struct dma_desc *)dma_alloc_coherent(priv->device,
-                                                  txsize *
-                                                  sizeof(struct dma_desc),
-                                                  &priv->dma_tx_phy,
-                                                  GFP_KERNEL);
-
-        if ((priv->dma_rx == NULL) || (priv->dma_tx == NULL)) {
-                pr_err("%s:ERROR allocating the DMA Tx/Rx desc\n", __func__);
+        priv->dma_tx = dma_alloc_coherent(priv->device,
+                                          txsize * sizeof(struct dma_desc),
+                                          &priv->dma_tx_phy, GFP_KERNEL);
+
+        if ((priv->dma_rx == NULL) || (priv->dma_tx == NULL))
                 return;
-        }
 
         DBG(probe, INFO, "stmmac (%s) DMA desc: virt addr (Rx %p, "
             "Tx %p)\n\tDMA phy addr (Rx 0x%08x, Tx 0x%08x)\n",