aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/parport/parport_amiga.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-10-19 01:42:14 -0400
committerJeff Garzik <jeff@garzik.org>2007-10-23 19:53:15 -0400
commit3f2e40df0e1d7694224c3083b0bebd129039a40a (patch)
tree3d0d8c2a9dd1f873e5638a132abc5d40c6ff583b /drivers/parport/parport_amiga.c
parent01e7ae8c13bb06a2ce622ebace33bb7e28ef596c (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_amiga.c')
-rw-r--r--drivers/parport/parport_amiga.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/parport/parport_amiga.c b/drivers/parport/parport_amiga.c
index a0afaee5ebe5..1586e1caa2f5 100644
--- a/drivers/parport/parport_amiga.c
+++ b/drivers/parport/parport_amiga.c
@@ -137,13 +137,6 @@ static unsigned char amiga_read_status(struct parport *p)
137 return status; 137 return status;
138} 138}
139 139
140/* as this ports irq handling is already done, we use a generic funktion */
141static irqreturn_t amiga_interrupt(int irq, void *dev_id)
142{
143 parport_generic_irq(irq, (struct parport *) dev_id);
144 return IRQ_HANDLED;
145}
146
147static void amiga_enable_irq(struct parport *p) 140static void amiga_enable_irq(struct parport *p)
148{ 141{
149 enable_irq(IRQ_AMIGA_CIAA_FLG); 142 enable_irq(IRQ_AMIGA_CIAA_FLG);
@@ -255,7 +248,7 @@ static int __init parport_amiga_init(void)
255 if (!p) 248 if (!p)
256 goto out_port; 249 goto out_port;
257 250
258 err = request_irq(IRQ_AMIGA_CIAA_FLG, amiga_interrupt, 0, p->name, p); 251 err = request_irq(IRQ_AMIGA_CIAA_FLG, parport_irq_handler, 0, p->name, p);
259 if (err) 252 if (err)
260 goto out_irq; 253 goto out_irq;
261 254