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

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / broadcom / sb1250-mac.c

diff --git a/drivers/net/ethernet/broadcom/sb1250-mac.c b/drivers/net/ethernet/broadcom/sb1250-mac.c
index 3a1c8a3cf7c91af5ada39f9ded17e604212b2c01..e80bfb60c3efb922a76149ce81b9a120c60fe9ce 100644 (file)
--- a/drivers/net/ethernet/broadcom/sb1250-mac.c
+++ b/drivers/net/ethernet/broadcom/sb1250-mac.c
@@ -831,11 +831,8 @@ static int sbdma_add_rcvbuffer(struct sbmac_softc *sc, struct sbmacdma *d,
                sb_new = netdev_alloc_skb(dev, ENET_PACKET_SIZE +
                                               SMP_CACHE_BYTES * 2 +
                                               NET_IP_ALIGN);
-               if (sb_new == NULL) {
-                       pr_info("%s: sk_buff allocation failed\n",
-                              d->sbdma_eth->sbm_dev->name);
+               if (sb_new == NULL)
                        return -ENOBUFS;
-               }
 
                sbdma_align_skb(sb_new, SMP_CACHE_BYTES, NET_IP_ALIGN);
        }
@@ -2385,7 +2382,7 @@ static int sbmac_mii_probe(struct net_device *dev)
                return -ENXIO;
        }
 
-       phy_dev = phy_connect(dev, dev_name(&phy_dev->dev), &sbmac_mii_poll, 0,
+       phy_dev = phy_connect(dev, dev_name(&phy_dev->dev), &sbmac_mii_poll,
                              PHY_INTERFACE_MODE_GMII);
        if (IS_ERR(phy_dev)) {
                printk(KERN_ERR "%s: could not attach to PHY\n", dev->name);