net/sonic: Clean up and modernize log messages
Add missing printk severity levels by adopting pr_foo() calls for the platform_driver and dev_foo() calls for the nubus_driver. Avoid KERN_CONT usage as per advice from checkpatch. Avoid #ifdef around printk calls. Don't log driver probe messages after calling register_netdev(). Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Cc: Chris Zankel <chris@zankel.net> Tested-by: Stan Johnson <userm57@yahoo.com> Signed-off-by: Finn Thain <fthain@telegraphics.com.au> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
3d16bada58
commit
bbc2f23a8f
@@ -142,17 +142,14 @@ static int sonic_probe1(struct net_device *dev)
|
||||
i++;
|
||||
|
||||
if (known_revisions[i] == 0xffff) {
|
||||
printk("SONIC ethernet controller not found (0x%4x)\n",
|
||||
silicon_revision);
|
||||
pr_info("SONIC ethernet controller not found (0x%4x)\n",
|
||||
silicon_revision);
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (sonic_debug && version_printed++ == 0)
|
||||
printk(version);
|
||||
|
||||
printk(KERN_INFO "%s: Sonic ethernet found at 0x%08lx, ",
|
||||
dev_name(lp->device), dev->base_addr);
|
||||
|
||||
/*
|
||||
* Put the sonic into software reset, then
|
||||
* retrieve and print the ethernet address.
|
||||
@@ -245,12 +242,14 @@ static int jazz_sonic_probe(struct platform_device *pdev)
|
||||
err = sonic_probe1(dev);
|
||||
if (err)
|
||||
goto out;
|
||||
|
||||
pr_info("SONIC ethernet @%08lx, MAC %pM, IRQ %d\n",
|
||||
dev->base_addr, dev->dev_addr, dev->irq);
|
||||
|
||||
err = register_netdev(dev);
|
||||
if (err)
|
||||
goto out1;
|
||||
|
||||
printk("%s: MAC %pM IRQ %d\n", dev->name, dev->dev_addr, dev->irq);
|
||||
|
||||
return 0;
|
||||
|
||||
out1:
|
||||
|
Reference in New Issue
Block a user