Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / natsemi / xtsonic.c

diff --git a/drivers/net/ethernet/natsemi/xtsonic.c b/drivers/net/ethernet/natsemi/xtsonic.c
index 5e4748e855f632f198adadda71221306fe6d4bcc..c2e0256fe3dfb423d1ba9011d7035379e1dd3f47 100644 (file)
--- 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;
        }