[PARPORT] Remove unused 'irq' argument from parport irq functions

None of the drivers with a struct pardevice's ->irq_func() hook ever
used the 'irq' argument passed to it, so remove it.

Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

11 files changed, 19 insertions, 39 deletions

diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c
index efe2f5c55b91..3aab837d9480 100644
--- a/drivers/char/ppdev.c
+++ b/drivers/char/ppdev.c
@@ -267,9 +267,9 @@ static ssize_t pp_write (struct file * file, const char __user * buf,
         return bytes_written;
 }
 
-static void pp_irq (int irq, void * private)
+static void pp_irq (void *private)
 {
-        struct pp_struct * pp = (struct pp_struct *) private;
+        struct pp_struct *pp = private;
 
         if (pp->irqresponse) {
                 parport_write_control (pp->pdev->port, pp->irqctl);
diff --git a/drivers/input/serio/parkbd.c b/drivers/input/serio/parkbd.c
index 688610e86a3e..b089977e0ef9 100644
--- a/drivers/input/serio/parkbd.c
+++ b/drivers/input/serio/parkbd.c
@@ -102,7 +102,7 @@ static int parkbd_write(struct serio *port, unsigned char c)
         return 0;
 }
 
-static void parkbd_interrupt(int irq, void *dev_id)
+static void parkbd_interrupt(void *dev_id)
 {
 
         if (parkbd_writing) {
diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c
index 1a5a75acf73e..dde9c7e6408a 100644
--- a/drivers/net/hamradio/baycom_epp.c
+++ b/drivers/net/hamradio/baycom_epp.c
@@ -325,12 +325,6 @@ static int eppconfig(struct baycom_state *bc)
 
 /* ---------------------------------------------------------------------- */
 
-static void epp_interrupt(int irq, void *dev_id)
-{
-}
-
-/* ---------------------------------------------------------------------- */
-
 static inline void do_kiss_params(struct baycom_state *bc,
                                   unsigned char *data, unsigned long len)
 {
@@ -871,7 +865,7 @@ static int epp_open(struct net_device *dev)
         }
         memset(&bc->modem, 0, sizeof(bc->modem));
         bc->pdev = parport_register_device(pp, dev->name, NULL, epp_wakeup, 
-                                        epp_interrupt, PARPORT_DEV_EXCL, dev);
+                                           NULL, PARPORT_DEV_EXCL, dev);
         parport_put_port(pp);
         if (!bc->pdev) {
                 printk(KERN_ERR "%s: cannot register parport at 0x%lx\n", bc_drvname, pp->base);
diff --git a/drivers/net/hamradio/baycom_par.c b/drivers/net/hamradio/baycom_par.c
index 5930aeb35015..2e6fc4dc74b1 100644
--- a/drivers/net/hamradio/baycom_par.c
+++ b/drivers/net/hamradio/baycom_par.c
@@ -270,9 +270,9 @@ static __inline__ void par96_rx(struct net_device *dev, struct baycom_state *bc)
 
 /* --------------------------------------------------------------------- */
 
-static void par96_interrupt(int irq, void *dev_id)
+static void par96_interrupt(void *dev_id)
 {
-        struct net_device *dev = (struct net_device *)dev_id;
+        struct net_device *dev = dev_id;
         struct baycom_state *bc = netdev_priv(dev);
 
         baycom_int_freq(bc);
diff --git a/drivers/net/plip.c b/drivers/net/plip.c
index b5e9981d1060..5071fcd8a0bd 100644
--- a/drivers/net/plip.c
+++ b/drivers/net/plip.c
@@ -143,7 +143,7 @@ static void plip_bh(struct work_struct *work);
 static void plip_timer_bh(struct work_struct *work);
 
 /* Interrupt handler */
-static void plip_interrupt(int irq, void *dev_id);
+static void plip_interrupt(void *dev_id);
 
 /* Functions for DEV methods */
 static int plip_tx_packet(struct sk_buff *skb, struct net_device *dev);
@@ -380,7 +380,7 @@ plip_timer_bh(struct work_struct *work)
                 container_of(work, struct net_local, timer.work);
 
         if (!(atomic_read (&nl->kill_timer))) {
-                plip_interrupt (-1, nl->dev);
+                plip_interrupt (nl->dev);
 
                 schedule_delayed_work(&nl->timer, 1);
         }
@@ -897,7 +897,7 @@ plip_error(struct net_device *dev, struct net_local *nl,
 
 /* Handle the parallel port interrupts. */
 static void
-plip_interrupt(int irq, void *dev_id)
+plip_interrupt(void *dev_id)
 {
         struct net_device *dev = dev_id;
         struct net_local *nl;
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/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 d0b353cf14ac..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;
diff --git a/include/linux/parport.h b/include/linux/parport.h
index 557c37de1f38..d1ad546c8c9e 100644
--- a/include/linux/parport.h
+++ b/include/linux/parport.h
@@ -230,7 +230,7 @@ struct pardevice {
         int (*preempt)(void *);
         void (*wakeup)(void *);
         void *private;
-        void (*irq_func)(int, void *);
+        void (*irq_func)(void *);
         unsigned int flags;
         struct pardevice *next;
         struct pardevice *prev;
@@ -383,7 +383,7 @@ extern void parport_put_port (struct parport *);
 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);
 
 /* parport_unregister unlinks a device from the chain. */
@@ -507,11 +507,7 @@ extern size_t parport_ieee1284_epp_read_addr (struct parport *,
 /* IEEE1284.3 functions */
 extern int parport_daisy_init (struct parport *port);
 extern void parport_daisy_fini (struct parport *port);
-extern struct pardevice *parport_open (int devnum, const char *name,
-                                       int (*pf) (void *),
-                                       void (*kf) (void *),
-                                       void (*irqf) (int, void *),
-                                       int flags, void *handle);
+extern struct pardevice *parport_open (int devnum, const char *name);
 extern void parport_close (struct pardevice *dev);
 extern ssize_t parport_device_id (int devnum, char *buffer, size_t len);
 extern void parport_daisy_deselect_all (struct parport *port);
@@ -523,7 +519,7 @@ static inline void parport_generic_irq(struct parport *port)
         parport_ieee1284_interrupt (port);
         read_lock(&port->cad_lock);
         if (port->cad && port->cad->irq_func)
-                port->cad->irq_func(port->irq, port->cad->private);
+                port->cad->irq_func(port->cad->private);
         read_unlock(&port->cad_lock);
 }
 
diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c
index 911c159bb3d3..dcc90f995294 100644
--- a/sound/drivers/mts64.c
+++ b/sound/drivers/mts64.c
@@ -830,7 +830,7 @@ static int __devinit snd_mts64_rawmidi_create(struct snd_card *card)
 /*********************************************************************
  * parport stuff
  *********************************************************************/
-static void snd_mts64_interrupt(int irq, void *private)
+static void snd_mts64_interrupt(void *private)
 {
         struct mts64 *mts = ((struct snd_card*)private)->private_data;
         u16 ret;
diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c
index 0eb9b5cebfcd..e065b2a6444a 100644
--- a/sound/drivers/portman2x4.c
+++ b/sound/drivers/portman2x4.c
@@ -611,7 +611,7 @@ static int __devinit snd_portman_rawmidi_create(struct snd_card *card)
 /*********************************************************************
  * parport stuff
  *********************************************************************/
-static void snd_portman_interrupt(int irq, void *userdata)
+static void snd_portman_interrupt(void *userdata)
 {
         unsigned char midivalue = 0;
         struct portman *pm = ((struct snd_card*)userdata)->private_data;