12 files changed, 26 insertions, 65 deletions

diff --git a/drivers/parport/daisy.c b/drivers/parport/daisy.c
index 5bbff2028f8f..3c8f06c3a5a0 100644
--- a/drivers/parport/daisy.c
+++ b/drivers/parport/daisy.c
@@ -199,11 +199,6 @@ void parport_daisy_fini(struct parport *port)
  *      parport_open - find a device by canonical device number
  *      @devnum: canonical device number
  *      @name: name to associate with the device
- *      @pf: preemption callback
- *      @kf: kick callback
- *      @irqf: interrupt handler
- *      @flags: registration flags
- *      @handle: driver data
  *
  *      This function is similar to parport_register_device(), except
  *      that it locates a device by its number rather than by the port
@@ -214,10 +209,7 @@ void parport_daisy_fini(struct parport *port)
  *      for parport_register_device().
  **/
 
-struct pardevice *parport_open(int devnum, const char *name,
-                                int (*pf) (void *), void (*kf) (void *),
-                                void (*irqf) (int, void *),
-                                int flags, void *handle)
+struct pardevice *parport_open(int devnum, const char *name)
 {
         struct daisydev *p = topology;
         struct parport *port;
@@ -237,8 +229,7 @@ struct pardevice *parport_open(int devnum, const char *name,
         port = parport_get_port(p->port);
         spin_unlock(&topology_lock);
 
-        dev = parport_register_device(port, name, pf, kf,
-                                       irqf, flags, handle);
+        dev = parport_register_device(port, name, NULL, NULL, NULL, 0, NULL);
         parport_put_port(port);
         if (!dev)
                 return NULL;
diff --git a/drivers/parport/ieee1284.c b/drivers/parport/ieee1284.c
index 5accaa7bde31..54a6ef72906e 100644
--- a/drivers/parport/ieee1284.c
+++ b/drivers/parport/ieee1284.c
@@ -571,7 +571,7 @@ static int parport_ieee1284_ack_data_avail (struct parport *port)
 #endif /* IEEE1284 support */
 
 /* Handle an interrupt. */
-void parport_ieee1284_interrupt (int which, void *handle)
+void parport_ieee1284_interrupt (void *handle)
 {
         struct parport *port = handle;
         parport_ieee1284_wakeup (port);
diff --git a/drivers/parport/parport_amiga.c b/drivers/parport/parport_amiga.c
index a0afaee5ebe5..1586e1caa2f5 100644
--- a/drivers/parport/parport_amiga.c
+++ b/drivers/parport/parport_amiga.c
@@ -137,13 +137,6 @@ static unsigned char amiga_read_status(struct parport *p)
         return status;
 }
 
-/* as this ports irq handling is already done, we use a generic funktion */
-static irqreturn_t amiga_interrupt(int irq, void *dev_id)
-{
-        parport_generic_irq(irq, (struct parport *) dev_id);
-        return IRQ_HANDLED;
-}
-
 static void amiga_enable_irq(struct parport *p)
 {
         enable_irq(IRQ_AMIGA_CIAA_FLG);
@@ -255,7 +248,7 @@ static int __init parport_amiga_init(void)
         if (!p)
                 goto out_port;
 
-        err = request_irq(IRQ_AMIGA_CIAA_FLG, amiga_interrupt, 0, p->name, p);
+        err = request_irq(IRQ_AMIGA_CIAA_FLG, parport_irq_handler, 0, p->name, p);
         if (err)
                 goto out_irq;
 
diff --git a/drivers/parport/parport_atari.c b/drivers/parport/parport_atari.c
index 6ea9929b8c7f..ad4cdd256137 100644
--- a/drivers/parport/parport_atari.c
+++ b/drivers/parport/parport_atari.c
@@ -103,13 +103,6 @@ parport_atari_restore_state(struct parport *p, struct parport_state *s)
 {
 }
 
-static irqreturn_t
-parport_atari_interrupt(int irq, void *dev_id)
-{
-        parport_generic_irq(irq, (struct parport *) dev_id);
-        return IRQ_HANDLED;
-}
-
 static void
 parport_atari_enable_irq(struct parport *p)
 {
@@ -208,7 +201,7 @@ static int __init parport_atari_init(void)
                                           &parport_atari_ops);
                 if (!p)
                         return -ENODEV;
-                if (request_irq(IRQ_MFP_BUSY, parport_atari_interrupt,
+                if (request_irq(IRQ_MFP_BUSY, parport_irq_handler,
                                 IRQ_TYPE_SLOW, p->name, p)) {
                         parport_put_port (p);
                         return -ENODEV;
diff --git a/drivers/parport/parport_ax88796.c b/drivers/parport/parport_ax88796.c
index 74f4e9742c6c..4ec220b2eae7 100644
--- a/drivers/parport/parport_ax88796.c
+++ b/drivers/parport/parport_ax88796.c
@@ -232,14 +232,6 @@ parport_ax88796_restore_state(struct parport *p, struct parport_state *s)
         writeb(s->u.ax88796.cpr, dd->spp_cpr);
 }
 
-static irqreturn_t
-parport_ax88796_interrupt(int irq, void *dev_id)
-{
-        parport_generic_irq(irq, dev_id);
-        return IRQ_HANDLED;
-}
-
-
 static struct parport_operations parport_ax88796_ops = {
         .write_data     = parport_ax88796_write_data,
         .read_data      = parport_ax88796_read_data,
@@ -344,7 +336,7 @@ static int parport_ax88796_probe(struct platform_device *pdev)
 
         if (irq >= 0) {
                 /* request irq */
-                ret = request_irq(irq, parport_ax88796_interrupt,
+                ret = request_irq(irq, parport_irq_handler,
                                   IRQF_TRIGGER_FALLING, pdev->name, pp);
 
                 if (ret < 0)
diff --git a/drivers/parport/parport_gsc.c b/drivers/parport/parport_gsc.c
index 43652ba523eb..0e77ae2b71a0 100644
--- a/drivers/parport/parport_gsc.c
+++ b/drivers/parport/parport_gsc.c
@@ -80,12 +80,6 @@ static int clear_epp_timeout(struct parport *pb)
  * of these are in parport_gsc.h.
  */
 
-static irqreturn_t parport_gsc_interrupt(int irq, void *dev_id)
-{
-        parport_generic_irq(irq, (struct parport *) dev_id);
-        return IRQ_HANDLED;
-}
-
 void parport_gsc_init_state(struct pardevice *dev, struct parport_state *s)
 {
         s->u.pc.ctr = 0xc | (dev->irq_func ? 0x10 : 0x0);
@@ -324,7 +318,7 @@ struct parport *__devinit parport_gsc_probe_port (unsigned long base,
         printk("]\n");
 
         if (p->irq != PARPORT_IRQ_NONE) {
-                if (request_irq (p->irq, parport_gsc_interrupt,
+                if (request_irq (p->irq, parport_irq_handler,
                                  0, p->name, p)) {
                         printk (KERN_WARNING "%s: irq %d in use, "
                                 "resorting to polled operation\n",
diff --git a/drivers/parport/parport_ip32.c b/drivers/parport/parport_ip32.c
index ec44efdbb84e..6d58bf895b1a 100644
--- a/drivers/parport/parport_ip32.c
+++ b/drivers/parport/parport_ip32.c
@@ -778,14 +778,16 @@ static irqreturn_t parport_ip32_interrupt(int irq, void *dev_id)
         struct parport * const p = dev_id;
         struct parport_ip32_private * const priv = p->physport->private_data;
         enum parport_ip32_irq_mode irq_mode = priv->irq_mode;
+
         switch (irq_mode) {
         case PARPORT_IP32_IRQ_FWD:
-                parport_generic_irq(irq, p);
-                break;
+                return parport_irq_handler(irq, dev_id);
+
         case PARPORT_IP32_IRQ_HERE:
                 parport_ip32_wakeup(p);
                 break;
         }
+
         return IRQ_HANDLED;
 }
 
diff --git a/drivers/parport/parport_mfc3.c b/drivers/parport/parport_mfc3.c
index 77726fc49766..6dec9ba5ed28 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]);
+                                parport_generic_irq(this_port[i]);
                         }
         return IRQ_HANDLED;
 }
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index e2be84001105..e9743d3efaf6 100644
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
@@ -272,13 +272,6 @@ static int clear_epp_timeout(struct parport *pb)
  * of these are in parport_pc.h.
  */
 
-static irqreturn_t parport_pc_interrupt(int irq, void *dev_id)
-{
-        parport_generic_irq(irq, (struct parport *) dev_id);
-        /* FIXME! Was it really ours? */
-        return IRQ_HANDLED;
-}
-
 static void parport_pc_init_state(struct pardevice *dev, struct parport_state *s)
 {
         s->u.pc.ctr = 0xc;
@@ -2301,7 +2294,7 @@ struct parport *parport_pc_probe_port (unsigned long int base,
                 EPP_res = NULL;
         }
         if (p->irq != PARPORT_IRQ_NONE) {
-                if (request_irq (p->irq, parport_pc_interrupt,
+                if (request_irq (p->irq, parport_irq_handler,
                                  0, p->name, p)) {
                         printk (KERN_WARNING "%s: irq %d in use, "
                                 "resorting to polled operation\n",
diff --git a/drivers/parport/parport_sunbpp.c b/drivers/parport/parport_sunbpp.c
index d27019c2f860..9d595aa91e46 100644
--- a/drivers/parport/parport_sunbpp.c
+++ b/drivers/parport/parport_sunbpp.c
@@ -46,12 +46,6 @@
 #define dprintk(x)
 #endif
 
-static irqreturn_t parport_sunbpp_interrupt(int irq, void *dev_id)
-{
-        parport_generic_irq(irq, (struct parport *) dev_id);
-        return IRQ_HANDLED;
-}
-
 static void parport_sunbpp_disable_irq(struct parport *p)
 {
         struct bpp_regs __iomem *regs = (struct bpp_regs __iomem *)p->base;
@@ -324,7 +318,7 @@ static int __devinit init_one_port(struct sbus_dev *sdev)
         p->size = size;
         p->dev = &sdev->ofdev.dev;
 
-        if ((err = request_irq(p->irq, parport_sunbpp_interrupt,
+        if ((err = request_irq(p->irq, parport_irq_handler,
                                IRQF_SHARED, p->name, p)) != 0) {
                 goto out_put_port;
         }
diff --git a/drivers/parport/probe.c b/drivers/parport/probe.c
index ea83b70e0de2..853a15f44f88 100644
--- a/drivers/parport/probe.c
+++ b/drivers/parport/probe.c
@@ -255,8 +255,7 @@ static ssize_t parport_read_device_id (struct parport *port, char *buffer,
 ssize_t parport_device_id (int devnum, char *buffer, size_t count)
 {
         ssize_t retval = -ENXIO;
-        struct pardevice *dev = parport_open (devnum, "Device ID probe",
-                                              NULL, NULL, NULL, 0, NULL);
+        struct pardevice *dev = parport_open (devnum, "Device ID probe");
         if (!dev)
                 return -ENXIO;
 
diff --git a/drivers/parport/share.c b/drivers/parport/share.c
index cd66442acfee..a8a62bbbb576 100644
--- a/drivers/parport/share.c
+++ b/drivers/parport/share.c
@@ -524,7 +524,7 @@ void parport_remove_port(struct parport *port)
 struct pardevice *
 parport_register_device(struct parport *port, const char *name,
                         int (*pf)(void *), void (*kf)(void *),
-                        void (*irq_func)(int, void *), 
+                        void (*irq_func)(void *), 
                         int flags, void *handle)
 {
         struct pardevice *tmp;
@@ -995,6 +995,15 @@ void parport_release(struct pardevice *dev)
         }
 }
 
+irqreturn_t parport_irq_handler(int irq, void *dev_id)
+{
+        struct parport *port = dev_id;
+
+        parport_generic_irq(port);
+
+        return IRQ_HANDLED;
+}
+
 /* Exported symbols for modules. */
 
 EXPORT_SYMBOL(parport_claim);
@@ -1011,5 +1020,6 @@ EXPORT_SYMBOL(parport_get_port);
 EXPORT_SYMBOL(parport_put_port);
 EXPORT_SYMBOL(parport_find_number);
 EXPORT_SYMBOL(parport_find_base);
+EXPORT_SYMBOL(parport_irq_handler);
 
 MODULE_LICENSE("GPL");