Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / tokenring / madgemc.c

diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c
index 3a25d191ea4af322ae851edd38f5128afb40cd88..f8f4d74f01f1e4959640d8dc0ad35fcd15afe4dd 100644 (file)
--- a/drivers/net/tokenring/madgemc.c
+++ b/drivers/net/tokenring/madgemc.c
@@ -23,7 +23,6 @@ static const char version[] = "madgemc.c: v0.91 23/01/2000 by Adam Fritzler\n";
 #include <linux/mca.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
-#include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/netdevice.h>
 #include <linux/trdevice.h>
@@ -70,7 +69,7 @@ static void madgemc_setregpage(struct net_device *dev, int page);
 static void madgemc_setsifsel(struct net_device *dev, int val);
 static void madgemc_setint(struct net_device *dev, int val);
 
-static irqreturn_t madgemc_interrupt(int irq, void *dev_id, struct pt_regs *regs);
+static irqreturn_t madgemc_interrupt(int irq, void *dev_id);
 
 /*
  * These work around paging, however they don't guarentee you're on the
@@ -311,7 +310,7 @@ static int __devinit madgemc_probe(struct device *device)
         */ 
        outb(0, dev->base_addr + MC_CONTROL_REG0); /* sanity */
        madgemc_setsifsel(dev, 1);
-       if (request_irq(dev->irq, madgemc_interrupt, SA_SHIRQ,
+       if (request_irq(dev->irq, madgemc_interrupt, IRQF_SHARED,
                       "madgemc", dev)) {
                ret = -EBUSY;
                goto getout3;
@@ -417,7 +416,7 @@ getout:
  * exhausted all contiguous interrupts.
  *
  */
-static irqreturn_t madgemc_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t madgemc_interrupt(int irq, void *dev_id)
 {
        int pending,reg1;
        struct net_device *dev;
@@ -451,7 +450,7 @@ static irqreturn_t madgemc_interrupt(int irq, void *dev_id, struct pt_regs *regs
                        outb(reg1, dev->base_addr + MC_CONTROL_REG1);
 
                        /* Continue handling as normal */
-                       tms380tr_interrupt(irq, dev_id, regs);
+                       tms380tr_interrupt(irq, dev_id);
 
                        pending = SIFREADW(SIFSTS); /* restart - the SIF way */
 
@@ -735,8 +734,7 @@ static int __devexit madgemc_remove(struct device *device)
        struct net_local *tp;
         struct card_info *card;
 
-       if (!dev)
-               BUG();
+       BUG_ON(!dev);
 
        tp = dev->priv;
        card = tp->tmspriv;