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, 20 deletions

diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index cd345b8969bc..e48261e468f3 100644
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -1969,13 +1969,8 @@ static int mvneta_rxq_init(struct mvneta_port *pp,
         rxq->descs = dma_alloc_coherent(pp->dev->dev.parent,
                                         rxq->size * MVNETA_DESC_ALIGNED_SIZE,
                                         &rxq->descs_phys, GFP_KERNEL);
-        if (rxq->descs == NULL) {
-                netdev_err(pp->dev,
-                           "rxq=%d: Can't allocate %d bytes for %d RX descr\n",
-                           rxq->id, rxq->size * MVNETA_DESC_ALIGNED_SIZE,
-                           rxq->size);
+        if (rxq->descs == NULL)
                 return -ENOMEM;
-        }
 
         BUG_ON(rxq->descs !=
                PTR_ALIGN(rxq->descs, MVNETA_CPU_D_CACHE_LINE_SIZE));
@@ -2029,13 +2024,8 @@ static int mvneta_txq_init(struct mvneta_port *pp,
         txq->descs = dma_alloc_coherent(pp->dev->dev.parent,
                                         txq->size * MVNETA_DESC_ALIGNED_SIZE,
                                         &txq->descs_phys, GFP_KERNEL);
-        if (txq->descs == NULL) {
-                netdev_err(pp->dev,
-                           "txQ=%d: Can't allocate %d bytes for %d TX descr\n",
-                           txq->id, txq->size * MVNETA_DESC_ALIGNED_SIZE,
-                           txq->size);
+        if (txq->descs == NULL)
                 return -ENOMEM;
-        }
 
         /* Make sure descriptor address is cache line size aligned  */
         BUG_ON(txq->descs !=
diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c
index 037ed866c22f..3ae4c7f0834d 100644
--- a/drivers/net/ethernet/marvell/pxa168_eth.c
+++ b/drivers/net/ethernet/marvell/pxa168_eth.c
@@ -1024,11 +1024,9 @@ static int rxq_init(struct net_device *dev)
         pep->rx_desc_area_size = size;
         pep->p_rx_desc_area = dma_alloc_coherent(pep->dev->dev.parent, size,
                                                 &pep->rx_desc_dma, GFP_KERNEL);
-        if (!pep->p_rx_desc_area) {
-                printk(KERN_ERR "%s: Cannot alloc RX ring (size %d bytes)\n",
-                       dev->name, size);
+        if (!pep->p_rx_desc_area)
                 goto out;
-        }
+
         memset((void *)pep->p_rx_desc_area, 0, size);
         /* initialize the next_desc_ptr links in the Rx descriptors ring */
         p_rx_desc = pep->p_rx_desc_area;
@@ -1087,11 +1085,8 @@ static int txq_init(struct net_device *dev)
         pep->tx_desc_area_size = size;
         pep->p_tx_desc_area = dma_alloc_coherent(pep->dev->dev.parent, size,
                                                 &pep->tx_desc_dma, GFP_KERNEL);
-        if (!pep->p_tx_desc_area) {
-                printk(KERN_ERR "%s: Cannot allocate Tx Ring (size %d bytes)\n",
-                       dev->name, size);
+        if (!pep->p_tx_desc_area)
                 goto out;
-        }
         memset((void *)pep->p_tx_desc_area, 0, pep->tx_desc_area_size);
         /* Initialize the next_desc_ptr links in the Tx descriptors ring */
         p_tx_desc = pep->p_tx_desc_area;