8390 : Replace ei_debug with msg_enable/NETIF_MSG_* feature

Removed the shared ei_debug variable. Replaced it by adding u32 msg_enable to
the private struct ei_device. Now each 8390 ethernet instance has a per-device
logging variable.

Changed older style printk() calls to more canonical forms.

Tested on: ne, ne2k-pci, smc-ultra, and wd hardware.

V4.0
- Substituted pr_info() and pr_debug() for printk() KERN_INFO and KERN_DEBUG

V3.0
- Checked for cases where pr_cont() was most appropriate choice.
- Changed module parameter from 'debug' to 'msg_enable' because debug was
no longer the best description.

V2.0
- Changed netif_msg_(drv|probe|ifdown|rx_err|tx_err|tx_queued|intr|rx_status|hw)
to netif_(dbg|info|warn|err) where possible.

Signed-off-by: Matthew Whitehead <tedheadster@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 14 insertions, 5 deletions

diff --git a/drivers/net/ethernet/8390/mac8390.c b/drivers/net/ethernet/8390/mac8390.c
index 88ccc8b14f0a..90e825e8abfe 100644
--- a/drivers/net/ethernet/8390/mac8390.c
+++ b/drivers/net/ethernet/8390/mac8390.c
@@ -167,6 +167,7 @@ static void slow_sane_block_output(struct net_device *dev, int count,
                                    const unsigned char *buf, int start_page);
 static void word_memcpy_tocard(unsigned long tp, const void *fp, int count);
 static void word_memcpy_fromcard(void *tp, unsigned long fp, int count);
+static u32 mac8390_msg_enable;
 
 static enum mac8390_type __init mac8390_ident(struct nubus_dev *dev)
 {
@@ -402,6 +403,7 @@ struct net_device * __init mac8390_probe(int unit)
         struct net_device *dev;
         struct nubus_dev *ndev = NULL;
         int err = -ENODEV;
+        struct ei_device *ei_local;
 
         static unsigned int slots;
 
@@ -440,6 +442,10 @@ struct net_device * __init mac8390_probe(int unit)
 
         if (!ndev)
                 goto out;
+
+         ei_local = netdev_priv(dev);
+         ei_local->msg_enable = mac8390_msg_enable;
+
         err = register_netdev(dev);
         if (err)
                 goto out;
@@ -660,19 +666,22 @@ static int mac8390_close(struct net_device *dev)
 
 static void mac8390_no_reset(struct net_device *dev)
 {
+        struct ei_device *ei_local = netdev_priv(dev);
+
         ei_status.txing = 0;
-        if (ei_debug > 1)
-                pr_info("reset not supported\n");
+        netif_info(ei_local, hw, dev, "reset not supported\n");
 }
 
 static void interlan_reset(struct net_device *dev)
 {
         unsigned char *target = nubus_slot_addr(IRQ2SLOT(dev->irq));
-        if (ei_debug > 1)
-                pr_info("Need to reset the NS8390 t=%lu...", jiffies);
+        struct ei_device *ei_local = netdev_priv(dev);
+
+        netif_info(ei_local, hw, dev, "Need to reset the NS8390 t=%lu...",
+                   jiffies);
         ei_status.txing = 0;
         target[0xC0000] = 0;
-        if (ei_debug > 1)
+        if (netif_msg_hw(ei_local))
                 pr_cont("reset complete\n");
 }