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>

2 files changed, 5 insertions, 16 deletions

diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
index 5ac43e4ace25..a64a6d74a5c8 100644
--- a/drivers/net/ethernet/xilinx/ll_temac_main.c
+++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
@@ -246,19 +246,14 @@ static int temac_dma_bd_init(struct net_device *ndev)
         lp->tx_bd_v = dma_alloc_coherent(ndev->dev.parent,
                                          sizeof(*lp->tx_bd_v) * TX_BD_NUM,
                                          &lp->tx_bd_p, GFP_KERNEL);
-        if (!lp->tx_bd_v) {
-                dev_err(&ndev->dev,
-                                "unable to allocate DMA TX buffer descriptors");
+        if (!lp->tx_bd_v)
                 goto out;
-        }
+
         lp->rx_bd_v = dma_alloc_coherent(ndev->dev.parent,
                                          sizeof(*lp->rx_bd_v) * RX_BD_NUM,
                                          &lp->rx_bd_p, GFP_KERNEL);
-        if (!lp->rx_bd_v) {
-                dev_err(&ndev->dev,
-                                "unable to allocate DMA RX buffer descriptors");
+        if (!lp->rx_bd_v)
                 goto out;
-        }
 
         memset(lp->tx_bd_v, 0, sizeof(*lp->tx_bd_v) * TX_BD_NUM);
         for (i = 0; i < TX_BD_NUM; i++) {
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index 397d4a6a1f30..c238f980e28e 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -205,21 +205,15 @@ static int axienet_dma_bd_init(struct net_device *ndev)
                                          sizeof(*lp->tx_bd_v) * TX_BD_NUM,
                                          &lp->tx_bd_p,
                                          GFP_KERNEL);
-        if (!lp->tx_bd_v) {
-                dev_err(&ndev->dev, "unable to allocate DMA Tx buffer "
-                        "descriptors");
+        if (!lp->tx_bd_v)
                 goto out;
-        }
 
         lp->rx_bd_v = dma_alloc_coherent(ndev->dev.parent,
                                          sizeof(*lp->rx_bd_v) * RX_BD_NUM,
                                          &lp->rx_bd_p,
                                          GFP_KERNEL);
-        if (!lp->rx_bd_v) {
-                dev_err(&ndev->dev, "unable to allocate DMA Rx buffer "
-                        "descriptors");
+        if (!lp->rx_bd_v)
                 goto out;
-        }
 
         memset(lp->tx_bd_v, 0, sizeof(*lp->tx_bd_v) * TX_BD_NUM);
         for (i = 0; i < TX_BD_NUM; i++) {