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

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;