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>

3 files changed, 17 insertions, 19 deletions

diff --git a/drivers/net/ethernet/natsemi/jazzsonic.c b/drivers/net/ethernet/natsemi/jazzsonic.c
index b0b361546365..c20766c2f65b 100644
--- a/drivers/net/ethernet/natsemi/jazzsonic.c
+++ b/drivers/net/ethernet/natsemi/jazzsonic.c
@@ -175,13 +175,13 @@ static int sonic_probe1(struct net_device *dev)
 
         /* Allocate the entire chunk of memory for the descriptors.
            Note that this cannot cross a 64K boundary. */
-        if ((lp->descriptors = dma_alloc_coherent(lp->device,
-                                SIZEOF_SONIC_DESC * SONIC_BUS_SCALE(lp->dma_bitmode),
-                                &lp->descriptors_laddr, GFP_KERNEL)) == NULL) {
-                printk(KERN_ERR "%s: couldn't alloc DMA memory for descriptors.\n",
-                       dev_name(lp->device));
+        lp->descriptors = dma_alloc_coherent(lp->device,
+                                             SIZEOF_SONIC_DESC *
+                                             SONIC_BUS_SCALE(lp->dma_bitmode),
+                                             &lp->descriptors_laddr,
+                                             GFP_KERNEL);
+        if (lp->descriptors == NULL)
                 goto out;
-        }
 
         /* Now set up the pointers to point to the appropriate places */
         lp->cda = lp->descriptors;
diff --git a/drivers/net/ethernet/natsemi/macsonic.c b/drivers/net/ethernet/natsemi/macsonic.c
index 0ffde69c8d01..346a4e025c34 100644
--- a/drivers/net/ethernet/natsemi/macsonic.c
+++ b/drivers/net/ethernet/natsemi/macsonic.c
@@ -202,13 +202,13 @@ static int macsonic_init(struct net_device *dev)
 
         /* Allocate the entire chunk of memory for the descriptors.
            Note that this cannot cross a 64K boundary. */
-        if ((lp->descriptors = dma_alloc_coherent(lp->device,
-                    SIZEOF_SONIC_DESC * SONIC_BUS_SCALE(lp->dma_bitmode),
-                    &lp->descriptors_laddr, GFP_KERNEL)) == NULL) {
-                printk(KERN_ERR "%s: couldn't alloc DMA memory for descriptors.\n",
-                       dev_name(lp->device));
+        lp->descriptors = dma_alloc_coherent(lp->device,
+                                             SIZEOF_SONIC_DESC *
+                                             SONIC_BUS_SCALE(lp->dma_bitmode),
+                                             &lp->descriptors_laddr,
+                                             GFP_KERNEL);
+        if (lp->descriptors == NULL)
                 return -ENOMEM;
-        }
 
         /* Now set up the pointers to point to the appropriate places */
         lp->cda = lp->descriptors;
diff --git a/drivers/net/ethernet/natsemi/xtsonic.c b/drivers/net/ethernet/natsemi/xtsonic.c
index 5e4748e855f6..c2e0256fe3df 100644
--- a/drivers/net/ethernet/natsemi/xtsonic.c
+++ b/drivers/net/ethernet/natsemi/xtsonic.c
@@ -197,14 +197,12 @@ static int __init sonic_probe1(struct net_device *dev)
          *  We also allocate extra space for a pointer to allow freeing
          *  this structure later on (in xtsonic_cleanup_module()).
          */
-        lp->descriptors =
-                dma_alloc_coherent(lp->device,
-                        SIZEOF_SONIC_DESC * SONIC_BUS_SCALE(lp->dma_bitmode),
-                        &lp->descriptors_laddr, GFP_KERNEL);
-
+        lp->descriptors = dma_alloc_coherent(lp->device,
+                                             SIZEOF_SONIC_DESC *
+                                             SONIC_BUS_SCALE(lp->dma_bitmode),
+                                             &lp->descriptors_laddr,
+                                             GFP_KERNEL);
         if (lp->descriptors == NULL) {
-                printk(KERN_ERR "%s: couldn't alloc DMA memory for "
-                                " descriptors.\n", dev_name(lp->device));
                 err = -ENOMEM;
                 goto out;
         }