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

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / apple / macmace.c

diff --git a/drivers/net/ethernet/apple/macmace.c b/drivers/net/ethernet/apple/macmace.c
index a206779c68cf2d48f5a6bcc6f98b99dd2c98426f..4ce8ceb6220584c1e1af51217f91cfa97f4e5783 100644 (file)
--- a/drivers/net/ethernet/apple/macmace.c
+++ b/drivers/net/ethernet/apple/macmace.c
@@ -386,20 +386,16 @@ static int mace_open(struct net_device *dev)
        /* Allocate the DMA ring buffers */
 
        mp->tx_ring = dma_alloc_coherent(mp->device,
-                       N_TX_RING * MACE_BUFF_SIZE,
-                       &mp->tx_ring_phys, GFP_KERNEL);
-       if (mp->tx_ring == NULL) {
-               printk(KERN_ERR "%s: unable to allocate DMA tx buffers\n", dev->name);
+                                        N_TX_RING * MACE_BUFF_SIZE,
+                                        &mp->tx_ring_phys, GFP_KERNEL);
+       if (mp->tx_ring == NULL)
                goto out1;
-       }
 
        mp->rx_ring = dma_alloc_coherent(mp->device,
-                       N_RX_RING * MACE_BUFF_SIZE,
-                       &mp->rx_ring_phys, GFP_KERNEL);
-       if (mp->rx_ring == NULL) {
-               printk(KERN_ERR "%s: unable to allocate DMA rx buffers\n", dev->name);
+                                        N_RX_RING * MACE_BUFF_SIZE,
+                                        &mp->rx_ring_phys, GFP_KERNEL);
+       if (mp->rx_ring == NULL)
                goto out2;
-       }
 
        mace_dma_off(dev);