net/sonic: Replace custom debug logging with netif_* calls
Eliminate duplicated debug code by moving it into the core driver. Don't log the only valid silicon revision number (it's in the source). 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

szülő
bbc2f23a8f
commit
995b2a6523
@@ -73,14 +73,6 @@ extern void xtboard_get_ether_addr(unsigned char *buf);
|
||||
#define SONIC_WRITE(reg,val) \
|
||||
*((volatile unsigned int *)dev->base_addr+reg) = val
|
||||
|
||||
|
||||
/* Use 0 for production, 1 for verification, and >2 for debug */
|
||||
#ifdef SONIC_DEBUG
|
||||
static unsigned int sonic_debug = SONIC_DEBUG;
|
||||
#else
|
||||
static unsigned int sonic_debug = 1;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* We cannot use station (ethernet) address prefixes to detect the
|
||||
* sonic controller since these are board manufacturer depended.
|
||||
@@ -130,7 +122,6 @@ static const struct net_device_ops xtsonic_netdev_ops = {
|
||||
|
||||
static int __init sonic_probe1(struct net_device *dev)
|
||||
{
|
||||
static unsigned version_printed = 0;
|
||||
unsigned int silicon_revision;
|
||||
struct sonic_local *lp = netdev_priv(dev);
|
||||
unsigned int base_addr = dev->base_addr;
|
||||
@@ -146,9 +137,6 @@ static int __init sonic_probe1(struct net_device *dev)
|
||||
* the expected location.
|
||||
*/
|
||||
silicon_revision = SONIC_READ(SONIC_SR);
|
||||
if (sonic_debug > 1)
|
||||
printk("SONIC Silicon Revision = 0x%04x\n",silicon_revision);
|
||||
|
||||
i = 0;
|
||||
while ((known_revisions[i] != 0xffff) &&
|
||||
(known_revisions[i] != silicon_revision))
|
||||
@@ -160,9 +148,6 @@ static int __init sonic_probe1(struct net_device *dev)
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
if (sonic_debug && version_printed++ == 0)
|
||||
printk(version);
|
||||
|
||||
/*
|
||||
* Put the sonic into software reset, then retrieve ethernet address.
|
||||
* Note: we are assuming that the boot-loader has initialized the cam.
|
||||
@@ -277,6 +262,8 @@ int xtsonic_probe(struct platform_device *pdev)
|
||||
pr_info("SONIC ethernet @%08lx, MAC %pM, IRQ %d\n",
|
||||
dev->base_addr, dev->dev_addr, dev->irq);
|
||||
|
||||
sonic_msg_init(dev);
|
||||
|
||||
if ((err = register_netdev(dev)))
|
||||
goto out1;
|
||||
|
||||
@@ -291,8 +278,6 @@ out:
|
||||
}
|
||||
|
||||
MODULE_DESCRIPTION("Xtensa XT2000 SONIC ethernet driver");
|
||||
module_param(sonic_debug, int, 0);
|
||||
MODULE_PARM_DESC(sonic_debug, "xtsonic debug level (1-4)");
|
||||
|
||||
#include "sonic.c"
|
||||
|
||||
|
Reference in New Issue
Block a user