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/usb/misc/uss720.c | |
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/usb/misc/uss720.c')
-rw-r--r-- | drivers/usb/misc/uss720.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/misc/uss720.c b/drivers/usb/misc/uss720.c index 2734fe2b9c43..f1255b0a182d 100644 --- a/drivers/usb/misc/uss720.c +++ b/drivers/usb/misc/uss720.c | |||
@@ -128,7 +128,7 @@ static void async_complete(struct urb *urb) | |||
128 | #endif | 128 | #endif |
129 | /* if nAck interrupts are enabled and we have an interrupt, call the interrupt procedure */ | 129 | /* if nAck interrupts are enabled and we have an interrupt, call the interrupt procedure */ |
130 | if (rq->reg[2] & rq->reg[1] & 0x10 && pp) | 130 | if (rq->reg[2] & rq->reg[1] & 0x10 && pp) |
131 | parport_generic_irq(0, pp); | 131 | parport_generic_irq(pp); |
132 | } | 132 | } |
133 | complete(&rq->compl); | 133 | complete(&rq->compl); |
134 | kref_put(&rq->ref_count, destroy_async); | 134 | kref_put(&rq->ref_count, destroy_async); |
@@ -337,7 +337,7 @@ static int uss720_irq(int usbstatus, void *buffer, int len, void *dev_id) | |||
337 | memcpy(priv->reg, buffer, 4); | 337 | memcpy(priv->reg, buffer, 4); |
338 | /* if nAck interrupts are enabled and we have an interrupt, call the interrupt procedure */ | 338 | /* if nAck interrupts are enabled and we have an interrupt, call the interrupt procedure */ |
339 | if (priv->reg[2] & priv->reg[1] & 0x10) | 339 | if (priv->reg[2] & priv->reg[1] & 0x10) |
340 | parport_generic_irq(0, pp); | 340 | parport_generic_irq(pp); |
341 | return 1; | 341 | return 1; |
342 | } | 342 | } |
343 | #endif | 343 | #endif |