[PATCH] m68k pt_regs fixes

m68k_handle_int() split in two functions: __m68k_handle_int() takes
pt_regs * and does set_irq_regs(); m68k_handle_int() doesn't get pt_regs
*.

Places where we used to call m68k_handle_int() recursively with the same
pt_regs have simply lost the second argument, the rest is switched to
__m68k_handle_int().

The rest of patch is just dropping pt_regs * where needed.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

7 files changed, 9 insertions, 9 deletions

diff --git a/drivers/char/vme_scc.c b/drivers/char/vme_scc.c
index 0cdbaa70cf9f..d0b94dd1af6d 100644
--- a/drivers/char/vme_scc.c
+++ b/drivers/char/vme_scc.c
@@ -593,7 +593,7 @@ static void scc_enable_tx_interrupts(void *ptr)
         local_irq_save(flags);
         SCCmod(INT_AND_DMA_REG, 0xff, IDR_TX_INT_ENAB);
         /* restart the transmitter */
-        scc_tx_int (0, port, 0);
+        scc_tx_int (0, port);
         local_irq_restore(flags);
 }
 
diff --git a/drivers/macintosh/adb-iop.c b/drivers/macintosh/adb-iop.c
index 1ffee7aaff20..17ef5d3c01b4 100644
--- a/drivers/macintosh/adb-iop.c
+++ b/drivers/macintosh/adb-iop.c
@@ -266,7 +266,7 @@ int adb_iop_autopoll(int devs)
 void adb_iop_poll(void)
 {
         if (adb_iop_state == idle) adb_iop_start();
-        iop_ism_irq(0, (void *) ADB_IOP, NULL);
+        iop_ism_irq(0, (void *) ADB_IOP);
 }
 
 int adb_iop_reset_bus(void)
diff --git a/drivers/macintosh/via-macii.c b/drivers/macintosh/via-macii.c
index ad4bd579f610..5d88d5b0ad99 100644
--- a/drivers/macintosh/via-macii.c
+++ b/drivers/macintosh/via-macii.c
@@ -295,7 +295,7 @@ static void macii_poll(void)
         unsigned long flags;
 
         local_irq_save(flags);
-        if (via[IFR] & SR_INT) macii_interrupt(0, NULL, NULL);
+        if (via[IFR] & SR_INT) macii_interrupt(0, NULL);
         local_irq_restore(flags);
 }
 
diff --git a/drivers/macintosh/via-maciisi.c b/drivers/macintosh/via-maciisi.c
index 789ee52086fe..1f0aa5dc9aa5 100644
--- a/drivers/macintosh/via-maciisi.c
+++ b/drivers/macintosh/via-maciisi.c
@@ -421,7 +421,7 @@ maciisi_poll(void)
 
         local_irq_save(flags);
         if (via[IFR] & SR_INT) {
-                maciisi_interrupt(0, NULL, NULL);
+                maciisi_interrupt(0, NULL);
         }
         else /* avoid calling this function too quickly in a loop */
                 udelay(ADB_DELAY);
diff --git a/drivers/macintosh/via-pmu68k.c b/drivers/macintosh/via-pmu68k.c
index 98ec915d0409..d9986f3a3fbf 100644
--- a/drivers/macintosh/via-pmu68k.c
+++ b/drivers/macintosh/via-pmu68k.c
@@ -221,7 +221,7 @@ pmu_init(void)
                 }
                 if (pmu_state == idle) {
                         adb_int_pending = 1;
-                        pmu_interrupt(0, NULL, NULL);
+                        pmu_interrupt(0, NULL);
                 }
                 pmu_poll();
                 udelay(10);
@@ -562,11 +562,11 @@ pmu_poll(void)
         local_irq_save(flags);
         if (via1[IFR] & SR_INT) {
                 via1[IFR] = SR_INT;
-                pmu_interrupt(IRQ_MAC_ADB_SR, NULL, NULL);
+                pmu_interrupt(IRQ_MAC_ADB_SR, NULL);
         }
         if (via1[IFR] & CB1_INT) {
                 via1[IFR] = CB1_INT;
-                pmu_interrupt(IRQ_MAC_ADB_CL, NULL, NULL);
+                pmu_interrupt(IRQ_MAC_ADB_CL, NULL);
         }
         local_irq_restore(flags);
 }
diff --git a/drivers/net/7990.c b/drivers/net/7990.c
index 8e996b4a34ea..7733697f7776 100644
--- a/drivers/net/7990.c
+++ b/drivers/net/7990.c
@@ -674,7 +674,7 @@ void lance_poll(struct net_device *dev)
         WRITERAP(lp, LE_CSR0);
         WRITERDP(lp, LE_C0_STRT);
         spin_unlock (&lp->devlock);
-        lance_interrupt(dev->irq, dev, NULL);
+        lance_interrupt(dev->irq, dev);
 }
 #endif
 
diff --git a/drivers/parport/parport_mfc3.c b/drivers/parport/parport_mfc3.c
index 6541cde4df00..e5b0a544de40 100644
--- a/drivers/parport/parport_mfc3.c
+++ b/drivers/parport/parport_mfc3.c
@@ -219,7 +219,7 @@ static irqreturn_t mfc3_interrupt(int irq, void *dev_id)
                 if (this_port[i] != NULL)
                         if (pia(this_port[i])->crb & 128) { /* Board caused interrupt */
                                 dummy = pia(this_port[i])->pprb; /* clear irq bit */
-                                parport_generic_irq(irq, this_port[i], regs);
+                                parport_generic_irq(irq, this_port[i]);
                         }
         return IRQ_HANDLED;
 }