Skip to content

Commit

Permalink
net/mac89x0: Fix and modernize log messages
Browse files Browse the repository at this point in the history
Fix log message fragments that no longer produce the desired output
since the behaviour of printk() was changed.
Add missing printk severity levels.
Drop deprecated "out of memory" message as per checkpatch advice.

Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Finn Thain authored and David S. Miller committed Mar 2, 2018
1 parent 43bf2e6 commit 86c2666
Showing 1 changed file with 9 additions and 10 deletions.
19 changes: 9 additions & 10 deletions drivers/net/ethernet/cirrus/mac89x0.c
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down Expand Up @@ -245,16 +247,14 @@ static int mac89x0_device_probe(struct platform_device *pdev)
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) {
Expand All @@ -269,7 +269,7 @@ static int mac89x0_device_probe(struct platform_device *pdev)

/* print the IRQ and ethernet address. */

printk(" IRQ %d ADDR %pM\n", dev->irq, dev->dev_addr);
pr_info("MAC %pM, IRQ %d\n", dev->dev_addr, dev->irq);

dev->netdev_ops = &mac89x0_netdev_ops;

Expand Down Expand Up @@ -472,7 +472,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;
}
Expand Down Expand Up @@ -560,7 +559,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++)
Expand Down

0 comments on commit 86c2666

Please sign in to comment.