diff options
author | Jeff Garzik <jeff@garzik.org> | 2007-10-19 01:42:14 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-10-23 19:53:15 -0400 |
commit | 3f2e40df0e1d7694224c3083b0bebd129039a40a (patch) | |
tree | 3d0d8c2a9dd1f873e5638a132abc5d40c6ff583b /drivers/parport/parport_ip32.c | |
parent | 01e7ae8c13bb06a2ce622ebace33bb7e28ef596c (diff) |
[PARPORT] Consolidate code copies into a single generic irq handler
Several arches used the exact same code for their parport irq handling.
Make that code generic, in parport_irq_handler().
Also, s/__inline__/inline/ in include/linux/parport.h.
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/parport/parport_ip32.c')
-rw-r--r-- | drivers/parport/parport_ip32.c | 6 |
1 files changed, 4 insertions, 2 deletions
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) | |||
778 | struct parport * const p = dev_id; | 778 | struct parport * const p = dev_id; |
779 | struct parport_ip32_private * const priv = p->physport->private_data; | 779 | struct parport_ip32_private * const priv = p->physport->private_data; |
780 | enum parport_ip32_irq_mode irq_mode = priv->irq_mode; | 780 | enum parport_ip32_irq_mode irq_mode = priv->irq_mode; |
781 | |||
781 | switch (irq_mode) { | 782 | switch (irq_mode) { |
782 | case PARPORT_IP32_IRQ_FWD: | 783 | case PARPORT_IP32_IRQ_FWD: |
783 | parport_generic_irq(irq, p); | 784 | return parport_irq_handler(irq, dev_id); |
784 | break; | 785 | |
785 | case PARPORT_IP32_IRQ_HERE: | 786 | case PARPORT_IP32_IRQ_HERE: |
786 | parport_ip32_wakeup(p); | 787 | parport_ip32_wakeup(p); |
787 | break; | 788 | break; |
788 | } | 789 | } |
790 | |||
789 | return IRQ_HANDLED; | 791 | return IRQ_HANDLED; |
790 | } | 792 | } |
791 | 793 | ||