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

diff --git a/drivers/net/ethernet/sun/sunbmac.c b/drivers/net/ethernet/sun/sunbmac.c
index 5fafca065305..054975939a18 100644
--- a/drivers/net/ethernet/sun/sunbmac.c
+++ b/drivers/net/ethernet/sun/sunbmac.c
@@ -1169,10 +1169,8 @@ static int bigmac_ether_init(struct platform_device *op,
         bp->bmac_block = dma_alloc_coherent(&bp->bigmac_op->dev,
                                             PAGE_SIZE,
                                             &bp->bblock_dvma, GFP_ATOMIC);
-        if (bp->bmac_block == NULL || bp->bblock_dvma == 0) {
-                printk(KERN_ERR "BIGMAC: Cannot allocate consistent DMA.\n");
+        if (bp->bmac_block == NULL || bp->bblock_dvma == 0)
                 goto fail_and_cleanup;
-        }
 
         /* Get the board revision of this BigMAC. */
         bp->board_rev = of_getintprop_default(bp->bigmac_op->dev.of_node,
diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c
index a1bff49a8155..436fa9d5a071 100644
--- a/drivers/net/ethernet/sun/sunhme.c
+++ b/drivers/net/ethernet/sun/sunhme.c
@@ -2752,10 +2752,8 @@ static int happy_meal_sbus_probe_one(struct platform_device *op, int is_qfe)
                                              &hp->hblock_dvma,
                                              GFP_ATOMIC);
         err = -ENOMEM;
-        if (!hp->happy_block) {
-                printk(KERN_ERR "happymeal: Cannot allocate descriptors.\n");
+        if (!hp->happy_block)
                 goto err_out_iounmap;
-        }
 
         /* Force check of the link first time we are brought up. */
         hp->linkcheck = 0;
@@ -3068,14 +3066,11 @@ static int happy_meal_pci_probe(struct pci_dev *pdev,
         hp->happy_bursts = DMA_BURSTBITS;
 #endif
 
-        hp->happy_block = (struct hmeal_init_block *)
-                dma_alloc_coherent(&pdev->dev, PAGE_SIZE, &hp->hblock_dvma, GFP_KERNEL);
-
+        hp->happy_block = dma_alloc_coherent(&pdev->dev, PAGE_SIZE,
+                                             &hp->hblock_dvma, GFP_KERNEL);
         err = -ENODEV;
-        if (!hp->happy_block) {
-                printk(KERN_ERR "happymeal(PCI): Cannot get hme init block.\n");
+        if (!hp->happy_block)
                 goto err_out_iounmap;
-        }
 
         hp->linkcheck = 0;
         hp->timer_state = asleep;