8390 : Replace ei_debug with msg_enable/NETIF_MSG_* feature

[pandora-kernel.git] / drivers / net / ethernet / 8390 / zorro8390.c

diff --git a/drivers/net/ethernet/8390/zorro8390.c b/drivers/net/ethernet/8390/zorro8390.c
index 85ec4c2..7b373e6 100644 (file)
--- a/drivers/net/ethernet/8390/zorro8390.c
+++ b/drivers/net/ethernet/8390/zorro8390.c
@@ -44,6 +44,8 @@
 static const char version[] =
        "8390.c:v1.10cvs 9/23/94 Donald Becker (becker@cesdis.gsfc.nasa.gov)\n";
 
+static u32 zorro8390_msg_enable;
+
 #include "lib8390.c"
 
 #define DRV_NAME       "zorro8390"
@@ -86,9 +88,9 @@ static struct card_info {
 static void zorro8390_reset_8390(struct net_device *dev)
 {
        unsigned long reset_start_time = jiffies;
+       struct ei_device *ei_local = netdev_priv(dev);
 
-       if (ei_debug > 1)
-               netdev_dbg(dev, "resetting - t=%ld...\n", jiffies);
+       netif_dbg(ei_local, hw, dev, "resetting - t=%ld...\n", jiffies);
 
        z_writeb(z_readb(NE_BASE + NE_RESET), NE_BASE + NE_RESET);
 
@@ -119,8 +121,9 @@ static void zorro8390_get_8390_hdr(struct net_device *dev,
         * If it does, it's the last thing you'll see
         */
        if (ei_status.dmaing) {
-               netdev_err(dev, "%s: DMAing conflict [DMAstat:%d][irqlock:%d]\n",
-                          __func__, ei_status.dmaing, ei_status.irqlock);
+               netdev_warn(dev,
+                           "%s: DMAing conflict [DMAstat:%d][irqlock:%d]\n",
+                           __func__, ei_status.dmaing, ei_status.irqlock);
                return;
        }
 
@@ -230,7 +233,7 @@ static void zorro8390_block_output(struct net_device *dev, int count,
        while ((z_readb(NE_BASE + NE_EN0_ISR) & ENISR_RDC) == 0)
                if (time_after(jiffies, dma_start + 2 * HZ / 100)) {
                                        /* 20ms */
-                       netdev_err(dev, "timeout waiting for Tx RDC\n");
+                       netdev_warn(dev, "timeout waiting for Tx RDC\n");
                        zorro8390_reset_8390(dev);
                        __NS8390_init(dev, 1);
                        break;
@@ -248,8 +251,9 @@ static int zorro8390_open(struct net_device *dev)
 
 static int zorro8390_close(struct net_device *dev)
 {
-       if (ei_debug > 1)
-               netdev_dbg(dev, "Shutting down ethercard\n");
+       struct ei_device *ei_local = netdev_priv(dev);
+
+       netif_dbg(ei_local, ifdown, dev, "Shutting down ethercard\n");
        __ei_close(dev);
        return 0;
 }
@@ -293,6 +297,7 @@ static int zorro8390_init(struct net_device *dev, unsigned long board,
        int err;
        unsigned char SA_prom[32];
        int start_page, stop_page;
+       struct ei_device *ei_local = netdev_priv(dev);
        static u32 zorro8390_offsets[16] = {
                0x00, 0x02, 0x04, 0x06, 0x08, 0x0a, 0x0c, 0x0e,
                0x10, 0x12, 0x14, 0x16, 0x18, 0x1a, 0x1c, 0x1e,
@@ -383,6 +388,9 @@ static int zorro8390_init(struct net_device *dev, unsigned long board,
 
        dev->netdev_ops = &zorro8390_netdev_ops;
        __NS8390_init(dev, 0);
+
+       ei_local->msg_enable = zorro8390_msg_enable;
+
        err = register_netdev(dev);
        if (err) {
                free_irq(IRQ_AMIGA_PORTS, dev);