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

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / amd / sun3lance.c

diff --git a/drivers/net/ethernet/amd/sun3lance.c b/drivers/net/ethernet/amd/sun3lance.c
index 74b3891b64836485143db3dca11948f29f95b683..4375abe61da1b4233678dd999784056a3237f3b4 100644 (file)
--- a/drivers/net/ethernet/amd/sun3lance.c
+++ b/drivers/net/ethernet/amd/sun3lance.c
@@ -812,9 +812,6 @@ static int lance_rx( struct net_device *dev )
                        else {
                                skb = netdev_alloc_skb(dev, pkt_len + 2);
                                if (skb == NULL) {
-                                       DPRINTK( 1, ( "%s: Memory squeeze, deferring packet.\n",
-                                                     dev->name ));
-
                                        dev->stats.rx_dropped++;
                                        head->msg_length = 0;
                                        head->flag |= RMD1_OWN_CHIP;
@@ -943,9 +940,7 @@ static struct net_device *sun3lance_dev;
 int __init init_module(void)
 {
        sun3lance_dev = sun3lance_probe(-1);
-       if (IS_ERR(sun3lance_dev))
-               return PTR_ERR(sun3lance_dev);
-       return 0;
+       return PTR_RET(sun3lance_dev);
 }
 
 void __exit cleanup_module(void)