Revert "8390 : Replace ei_debug with msg_enable/NETIF_MSG_* feature"

[~andy/linux] / drivers / net / ethernet / 8390 / apne.c

diff --git a/drivers/net/ethernet/8390/apne.c b/drivers/net/ethernet/8390/apne.c
index 811fa5d5c6971c0a71f55d12e420fb38691bb9f7..912ed7a5f33af5da3e3718cb9d2972be2d4c81d8 100644 (file)
--- a/drivers/net/ethernet/8390/apne.c
+++ b/drivers/net/ethernet/8390/apne.c
@@ -116,15 +116,9 @@ static const char version[] =
 
 static int apne_owned; /* signal if card already owned */
 
-static u32 apne_msg_enable;
-module_param_named(msg_enable, apne_msg_enable, uint, (S_IRUSR|S_IRGRP|S_IROTH));
-MODULE_PARM_DESC(msg_enable, "Debug message level (see linux/netdevice.h for bitmap)");
-
 struct net_device * __init apne_probe(int unit)
 {
        struct net_device *dev;
-       struct ei_device *ei_local;
-
 #ifndef MANUAL_CONFIG
        char tuple[8];
 #endif
@@ -139,11 +133,11 @@ struct net_device * __init apne_probe(int unit)
        if ( !(AMIGAHW_PRESENT(PCMCIA)) )
                return ERR_PTR(-ENODEV);
 
-       pr_info("Looking for PCMCIA ethernet card : ");
+       printk("Looking for PCMCIA ethernet card : ");
 
        /* check if a card is inserted */
        if (!(PCMCIA_INSERTED)) {
-               pr_cont("NO PCMCIA card inserted\n");
+               printk("NO PCMCIA card inserted\n");
                return ERR_PTR(-ENODEV);
        }
 
@@ -154,8 +148,6 @@ struct net_device * __init apne_probe(int unit)
                sprintf(dev->name, "eth%d", unit);
                netdev_boot_setup_check(dev);
        }
-       ei_local = netdev_priv(dev);
-       ei_local->msg_enable = apne_msg_enable;
 
        /* disable pcmcia irq for readtuple */
        pcmcia_disable_irq();
@@ -163,14 +155,14 @@ struct net_device * __init apne_probe(int unit)
 #ifndef MANUAL_CONFIG
        if ((pcmcia_copy_tuple(CISTPL_FUNCID, tuple, 8) < 3) ||
                (tuple[2] != CISTPL_FUNCID_NETWORK)) {
-               pr_cont("not an ethernet card\n");
+               printk("not an ethernet card\n");
                /* XXX: shouldn't we re-enable irq here? */
                free_netdev(dev);
                return ERR_PTR(-ENODEV);
        }
 #endif
 
-       pr_cont("ethernet PCMCIA card inserted\n");
+       printk("ethernet PCMCIA card inserted\n");
 
        if (!init_pcmcia()) {
                /* XXX: shouldn't we re-enable irq here? */
@@ -212,12 +204,11 @@ static int __init apne_probe1(struct net_device *dev, int ioaddr)
     int neX000, ctron;
 #endif
     static unsigned version_printed;
-    struct ei_device *ei_local = netdev_priv(dev);
 
-    if ((apne_msg_enable & NETIF_MSG_DRV) && (version_printed++ == 0))
-               netdev_info(dev, version);
+    if (ei_debug  &&  version_printed++ == 0)
+       printk(version);
 
-    netdev_info(dev, "PCMCIA NE*000 ethercard probe");
+    printk("PCMCIA NE*000 ethercard probe");
 
     /* Reset card. Who knows what dain-bramaged state it was left in. */
     {  unsigned long reset_start_time = jiffies;
@@ -226,7 +217,7 @@ static int __init apne_probe1(struct net_device *dev, int ioaddr)
 
        while ((inb(ioaddr + NE_EN0_ISR) & ENISR_RESET) == 0)
                if (time_after(jiffies, reset_start_time + 2*HZ/100)) {
-                       pr_cont(" not found (no reset ack).\n");
+                       printk(" not found (no reset ack).\n");
                        return -ENODEV;
                }
 
@@ -297,7 +288,7 @@ static int __init apne_probe1(struct net_device *dev, int ioaddr)
        start_page = 0x01;
        stop_page = (wordlength == 2) ? 0x40 : 0x20;
     } else {
-       pr_cont(" not found.\n");
+       printk(" not found.\n");
        return -ENXIO;
 
     }
@@ -329,9 +320,9 @@ static int __init apne_probe1(struct net_device *dev, int ioaddr)
     for (i = 0; i < ETH_ALEN; i++)
        dev->dev_addr[i] = SA_prom[i];
 
-    pr_cont(" %pM\n", dev->dev_addr);
+    printk(" %pM\n", dev->dev_addr);
 
-    netdev_info(dev, "%s found.\n", name);
+    printk("%s: %s found.\n", dev->name, name);
 
     ei_status.name = name;
     ei_status.tx_start_page = start_page;
@@ -361,11 +352,10 @@ static void
 apne_reset_8390(struct net_device *dev)
 {
     unsigned long reset_start_time = jiffies;
-    struct ei_device *ei_local = netdev_priv(dev);
 
     init_pcmcia();
 
-    netif_dbg(ei_local, hw, dev, "resetting the 8390 t=%ld...\n", jiffies);
+    if (ei_debug > 1) printk("resetting the 8390 t=%ld...", jiffies);
 
     outb(inb(NE_BASE + NE_RESET), NE_BASE + NE_RESET);
 
@@ -375,8 +365,8 @@ apne_reset_8390(struct net_device *dev)
     /* This check _should_not_ be necessary, omit eventually. */
     while ((inb(NE_BASE+NE_EN0_ISR) & ENISR_RESET) == 0)
        if (time_after(jiffies, reset_start_time + 2*HZ/100)) {
-               netdev_err(dev, "ne_reset_8390() did not complete.\n");
-               break;
+           printk("%s: ne_reset_8390() did not complete.\n", dev->name);
+           break;
        }
     outb(ENISR_RESET, NE_BASE + NE_EN0_ISR);   /* Ack intr. */
 }
@@ -396,9 +386,9 @@ apne_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr, int ring_pa
 
     /* This *shouldn't* happen. If it does, it's the last thing you'll see */
     if (ei_status.dmaing) {
-       netdev_err(dev, "DMAing conflict in ne_get_8390_hdr "
-                  "[DMAstat:%d][irqlock:%d][intr:%d].\n",
-                  ei_status.dmaing, ei_status.irqlock, dev->irq);
+       printk("%s: DMAing conflict in ne_get_8390_hdr "
+          "[DMAstat:%d][irqlock:%d][intr:%d].\n",
+          dev->name, ei_status.dmaing, ei_status.irqlock, dev->irq);
        return;
     }
 
@@ -443,9 +433,9 @@ apne_block_input(struct net_device *dev, int count, struct sk_buff *skb, int rin
 
     /* This *shouldn't* happen. If it does, it's the last thing you'll see */
     if (ei_status.dmaing) {
-               netdev_err(dev, "DMAing conflict in ne_block_input "
-                          "[DMAstat:%d][irqlock:%d][intr:%d].\n",
-                          ei_status.dmaing, ei_status.irqlock, dev->irq);
+       printk("%s: DMAing conflict in ne_block_input "
+          "[DMAstat:%d][irqlock:%d][intr:%d].\n",
+          dev->name, ei_status.dmaing, ei_status.irqlock, dev->irq);
        return;
     }
     ei_status.dmaing |= 0x01;
@@ -491,9 +481,9 @@ apne_block_output(struct net_device *dev, int count,
 
     /* This *shouldn't* happen. If it does, it's the last thing you'll see */
     if (ei_status.dmaing) {
-               netdev_err(dev, "DMAing conflict in ne_block_output."
-                          "[DMAstat:%d][irqlock:%d][intr:%d]\n",
-                          ei_status.dmaing, ei_status.irqlock, dev->irq);
+       printk("%s: DMAing conflict in ne_block_output."
+          "[DMAstat:%d][irqlock:%d][intr:%d]\n",
+          dev->name, ei_status.dmaing, ei_status.irqlock, dev->irq);
        return;
     }
     ei_status.dmaing |= 0x01;
@@ -523,7 +513,7 @@ apne_block_output(struct net_device *dev, int count,
 
     while ((inb(NE_BASE + NE_EN0_ISR) & ENISR_RDC) == 0)
        if (time_after(jiffies, dma_start + 2*HZ/100)) {        /* 20ms */
-               netdev_warn(dev, "timeout waiting for Tx RDC.\n");
+               printk("%s: timeout waiting for Tx RDC.\n", dev->name);
                apne_reset_8390(dev);
                NS8390_init(dev,1);
                break;
@@ -546,8 +536,8 @@ static irqreturn_t apne_interrupt(int irq, void *dev_id)
         pcmcia_ack_int(pcmcia_intreq);
         return IRQ_NONE;
     }
-    if (apne_msg_enable & NETIF_MSG_INTR)
-       pr_debug("pcmcia intreq = %x\n", pcmcia_intreq);
+    if (ei_debug > 3)
+        printk("pcmcia intreq = %x\n", pcmcia_intreq);
     pcmcia_disable_irq();                      /* to get rid of the sti() within ei_interrupt */
     ei_interrupt(irq, dev_id);
     pcmcia_ack_int(pcmcia_get_intreq());