[PATCH RESEND net 3/9] net/mac89x0: Fix and modernize log messages
From: Finn Thain <hidden>
Date: 2017-10-03 01:09:30
Also in:
lkml
Subsystem:
networking drivers, the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Fix misplaced newlines in conditional log messages. Add missing printk severity levels. Log the MAC address after the interface gets a meaningful name. Drop deprecated "out of memory" message as per checkpatch advice. Signed-off-by: Finn Thain <redacted> --- drivers/net/ethernet/cirrus/mac89x0.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/drivers/net/ethernet/cirrus/mac89x0.c b/drivers/net/ethernet/cirrus/mac89x0.c
index 8fc43c865621..4393d9b89f33 100644
--- a/drivers/net/ethernet/cirrus/mac89x0.c
+++ b/drivers/net/ethernet/cirrus/mac89x0.c@@ -56,6 +56,8 @@ local_irq_{dis,en}able() */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + static const char version[] = "cs89x0.c:v1.02 11/26/96 Russell Nelson <nelson@crynwr.com>\n";
@@ -243,16 +245,14 @@ struct net_device * __init mac89x0_probe(int unit) if (net_debug && version_printed++ == 0) printk(version); - printk(KERN_INFO "%s: cs89%c0%s rev %c found at %#8lx", - dev->name, - lp->chip_type==CS8900?'0':'2', - lp->chip_type==CS8920M?"M":"", - lp->chip_revision, - dev->base_addr); + pr_info("CS89%c0%s rev %c found at %#8lx\n", + lp->chip_type == CS8900 ? '0' : '2', + lp->chip_type == CS8920M ? "M" : "", + lp->chip_revision, dev->base_addr); /* Try to read the MAC address */ if ((readreg(dev, PP_SelfST) & (EEPROM_PRESENT | EEPROM_OK)) == 0) { - printk("\nmac89x0: No EEPROM, giving up now.\n"); + pr_info("No EEPROM, giving up now\n"); goto out1; } else { for (i = 0; i < ETH_ALEN; i += 2) {
@@ -265,15 +265,14 @@ struct net_device * __init mac89x0_probe(int unit) dev->irq = SLOT2IRQ(slot); - /* print the IRQ and ethernet address. */ - - printk(" IRQ %d ADDR %pM\n", dev->irq, dev->dev_addr); - dev->netdev_ops = &mac89x0_netdev_ops; err = register_netdev(dev); if (err) goto out1; + + netdev_info(dev, "MAC %pM, IRQ %d\n", dev->dev_addr, dev->irq); + return NULL; out1: nubus_writew(0, dev->base_addr + ADD_PORT);
@@ -468,7 +467,6 @@ net_rx(struct net_device *dev) /* Malloc up new buffer. */ skb = alloc_skb(length, GFP_ATOMIC); if (skb == NULL) { - printk("%s: Memory squeeze, dropping packet.\n", dev->name); dev->stats.rx_dropped++; return; }
@@ -556,7 +554,7 @@ static int set_mac_address(struct net_device *dev, void *addr) return -EADDRNOTAVAIL; memcpy(dev->dev_addr, saddr->sa_data, ETH_ALEN); - printk("%s: Setting MAC address to %pM\n", dev->name, dev->dev_addr); + netdev_info(dev, "Setting MAC address to %pM\n", dev->dev_addr); /* set the Ethernet address */ for (i=0; i < ETH_ALEN/2; i++)
@@ -580,7 +578,7 @@ init_module(void) net_debug = debug; dev_cs89x0 = mac89x0_probe(-1); if (IS_ERR(dev_cs89x0)) { - printk(KERN_WARNING "mac89x0.c: No card found\n"); + pr_warn("No card found\n"); return PTR_ERR(dev_cs89x0); } return 0;
--
2.13.5