Merge remote-tracking branch 'sound-current/for-linus'

[karo-tx-linux.git] / drivers / net / arcnet / com20020-isa.c

diff --git a/drivers/net/arcnet/com20020-isa.c b/drivers/net/arcnet/com20020-isa.c
index f3b2222bcada4f4e447c28c7322aba89dbbc373a..b9e9931353b22a727066eaef790dec1f63d3fd5f 100644 (file)
--- a/drivers/net/arcnet/com20020-isa.c
+++ b/drivers/net/arcnet/com20020-isa.c
@@ -39,11 +39,11 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/bootmem.h>
-#include <linux/arcdevice.h>
-#include <linux/com20020.h>
-
 #include <linux/io.h>
 
+#include "arcdevice.h"
+#include "com20020.h"
+
 /* We cannot (yet) probe for an IO mapped card, although we can check that
  * it's where we were told it was, and even do autoirq.
  */
@@ -67,7 +67,7 @@ static int __init com20020isa_probe(struct net_device *dev)
                           ioaddr, ioaddr + ARCNET_TOTAL_SIZE - 1);
                return -ENXIO;
        }
-       if (ASTATUS() == 0xFF) {
+       if (arcnet_inb(ioaddr, COM20020_REG_R_STATUS) == 0xFF) {
                arc_printk(D_NORMAL, dev, "IO address %x empty\n", ioaddr);
                err = -ENODEV;
                goto out;
@@ -83,20 +83,20 @@ static int __init com20020isa_probe(struct net_device *dev)
                 * we tell it to start receiving.
                 */
                arc_printk(D_INIT_REASONS, dev, "intmask was %02Xh\n",
-                          inb(_INTMASK));
-               outb(0, _INTMASK);
+                          arcnet_inb(ioaddr, COM20020_REG_R_STATUS));
+               arcnet_outb(0, ioaddr, COM20020_REG_W_INTMASK);
                airqmask = probe_irq_on();
-               outb(NORXflag, _INTMASK);
+               arcnet_outb(NORXflag, ioaddr, COM20020_REG_W_INTMASK);
                udelay(1);
-               outb(0, _INTMASK);
+               arcnet_outb(0, ioaddr, COM20020_REG_W_INTMASK);
                dev->irq = probe_irq_off(airqmask);
 
                if ((int)dev->irq <= 0) {
                        arc_printk(D_INIT_REASONS, dev, "Autoprobe IRQ failed first time\n");
                        airqmask = probe_irq_on();
-                       outb(NORXflag, _INTMASK);
+                       arcnet_outb(NORXflag, ioaddr, COM20020_REG_W_INTMASK);
                        udelay(5);
-                       outb(0, _INTMASK);
+                       arcnet_outb(0, ioaddr, COM20020_REG_W_INTMASK);
                        dev->irq = probe_irq_off(airqmask);
                        if ((int)dev->irq <= 0) {
                                arc_printk(D_NORMAL, dev, "Autoprobe IRQ failed.\n");
@@ -107,7 +107,9 @@ static int __init com20020isa_probe(struct net_device *dev)
        }
 
        lp->card_name = "ISA COM20020";
-       if ((err = com20020_found(dev, 0)) != 0)
+
+       err = com20020_found(dev, 0);
+       if (err != 0)
                goto out;
 
        return 0;