diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-10-19 01:56:02 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-10-23 19:53:15 -0400 |
| commit | f230d1010ad0dcd71d9ca8ea6864afac49c5aa9b (patch) | |
| tree | 6bb5e61167c520727724c9ad0297f3bcd743151b /drivers | |
| parent | 3f2e40df0e1d7694224c3083b0bebd129039a40a (diff) | |
[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')
| -rw-r--r-- | drivers/parport/ieee1284.c | 2 | ||||
| -rw-r--r-- | drivers/parport/parport_mfc3.c | 2 | ||||
| -rw-r--r-- | drivers/parport/share.c | 2 | ||||
| -rw-r--r-- | drivers/usb/misc/uss720.c | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/parport/ieee1284.c b/drivers/parport/ieee1284.c index 5accaa7bde3..54a6ef72906 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 77726fc4976..6dec9ba5ed2 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 414c52a5883..d0b353cf14a 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; } diff --git a/drivers/usb/misc/uss720.c b/drivers/usb/misc/uss720.c index 2734fe2b9c4..f1255b0a182 100644 --- a/drivers/usb/misc/uss720.c +++ b/drivers/usb/misc/uss720.c @@ -128,7 +128,7 @@ static void async_complete(struct urb *urb) #endif /* if nAck interrupts are enabled and we have an interrupt, call the interrupt procedure */ if (rq->reg[2] & rq->reg[1] & 0x10 && pp) - parport_generic_irq(0, pp); + parport_generic_irq(pp); } complete(&rq->compl); kref_put(&rq->ref_count, destroy_async); @@ -337,7 +337,7 @@ static int uss720_irq(int usbstatus, void *buffer, int len, void *dev_id) memcpy(priv->reg, buffer, 4); /* if nAck interrupts are enabled and we have an interrupt, call the interrupt procedure */ if (priv->reg[2] & priv->reg[1] & 0x10) - parport_generic_irq(0, pp); + parport_generic_irq(pp); return 1; } #endif |