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

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

diff --git a/drivers/net/ethernet/amd/sunlance.c b/drivers/net/ethernet/amd/sunlance.c
index c2d696c88e4687c46233b017429f2fc86c9aca8f..f47b780892e97f4a4e5ca186e08ee1679f4eee6c 100644 (file)
--- a/drivers/net/ethernet/amd/sunlance.c
+++ b/drivers/net/ethernet/amd/sunlance.c
@@ -536,8 +536,6 @@ static void lance_rx_dvma(struct net_device *dev)
                        skb = netdev_alloc_skb(dev, len + 2);
 
                        if (skb == NULL) {
-                               printk(KERN_INFO "%s: Memory squeeze, deferring packet.\n",
-                                      dev->name);
                                dev->stats.rx_dropped++;
                                rd->mblength = 0;
                                rd->rmd1_bits = LE_R1_OWN;
@@ -708,8 +706,6 @@ static void lance_rx_pio(struct net_device *dev)
                        skb = netdev_alloc_skb(dev, len + 2);
 
                        if (skb == NULL) {
-                               printk(KERN_INFO "%s: Memory squeeze, deferring packet.\n",
-                                      dev->name);
                                dev->stats.rx_dropped++;
                                sbus_writew(0, &rd->mblength);
                                sbus_writeb(LE_R1_OWN, &rd->rmd1_bits);
@@ -1284,8 +1280,8 @@ static void lance_free_hwresources(struct lance_private *lp)
 /* Ethtool support... */
 static void sparc_lance_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
 {
-       strcpy(info->driver, "sunlance");
-       strcpy(info->version, "2.02");
+       strlcpy(info->driver, "sunlance", sizeof(info->driver));
+       strlcpy(info->version, "2.02", sizeof(info->version));
 }
 
 static const struct ethtool_ops sparc_lance_ethtool_ops = {
@@ -1377,10 +1373,9 @@ static int sparc_lance_probe_one(struct platform_device *op,
                        dma_alloc_coherent(&op->dev,
                                           sizeof(struct lance_init_block),
                                           &lp->init_block_dvma, GFP_ATOMIC);
-               if (!lp->init_block_mem) {
-                       printk(KERN_ERR "SunLance: Cannot allocate consistent DMA memory.\n");
+               if (!lp->init_block_mem)
                        goto fail;
-               }
+
                lp->pio_buffer = 0;
                lp->init_ring = lance_init_ring_dvma;
                lp->rx = lance_rx_dvma;