summaryrefslogtreecommitdiffstats
path: root/drivers/parport
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-10-19 01:56:02 -0400
committerJeff Garzik <jeff@garzik.org>2007-10-23 19:53:15 -0400
commitf230d1010ad0dcd71d9ca8ea6864afac49c5aa9b (patch)
tree6bb5e61167c520727724c9ad0297f3bcd743151b /drivers/parport
parent3f2e40df0e1d7694224c3083b0bebd129039a40a (diff)
downloadlinux-stable-f230d1010ad0dcd71d9ca8ea6864afac49c5aa9b.tar.gz
linux-stable-f230d1010ad0dcd71d9ca8ea6864afac49c5aa9b.tar.bz2
linux-stable-f230d1010ad0dcd71d9ca8ea6864afac49c5aa9b.zip
[PARPORT] Kill useful 'irq' arg from parport_{generic_irq,ieee1284_interrupt}
parport_ieee1284_interrupt() was not using its first arg at all. Delete. parport_generic_irq()'s second arg makes its first arg completely redundant. Delete, and use port->irq in the one place where we actually need it. Also, s/__inline__/inline/ to make the code look nicer. Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/parport')
-rw-r--r--drivers/parport/ieee1284.c2
-rw-r--r--drivers/parport/parport_mfc3.c2
-rw-r--r--drivers/parport/share.c2
3 files changed, 3 insertions, 3 deletions
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_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/share.c b/drivers/parport/share.c
index 414c52a5883a..d0b353cf14ac 100644
--- a/drivers/parport/share.c
+++ b/drivers/parport/share.c
@@ -999,7 +999,7 @@ irqreturn_t parport_irq_handler(int irq, void *dev_id)
{
struct parport *port = dev_id;
- parport_generic_irq(irq, port);
+ parport_generic_irq(port);
return IRQ_HANDLED;
}