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_ax88796.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_ax88796.c')
-rw-r--r-- | drivers/parport/parport_ax88796.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/parport/parport_ax88796.c b/drivers/parport/parport_ax88796.c index 74f4e9742c6c..4ec220b2eae7 100644 --- a/drivers/parport/parport_ax88796.c +++ b/drivers/parport/parport_ax88796.c | |||
@@ -232,14 +232,6 @@ parport_ax88796_restore_state(struct parport *p, struct parport_state *s) | |||
232 | writeb(s->u.ax88796.cpr, dd->spp_cpr); | 232 | writeb(s->u.ax88796.cpr, dd->spp_cpr); |
233 | } | 233 | } |
234 | 234 | ||
235 | static irqreturn_t | ||
236 | parport_ax88796_interrupt(int irq, void *dev_id) | ||
237 | { | ||
238 | parport_generic_irq(irq, dev_id); | ||
239 | return IRQ_HANDLED; | ||
240 | } | ||
241 | |||
242 | |||
243 | static struct parport_operations parport_ax88796_ops = { | 235 | static struct parport_operations parport_ax88796_ops = { |
244 | .write_data = parport_ax88796_write_data, | 236 | .write_data = parport_ax88796_write_data, |
245 | .read_data = parport_ax88796_read_data, | 237 | .read_data = parport_ax88796_read_data, |
@@ -344,7 +336,7 @@ static int parport_ax88796_probe(struct platform_device *pdev) | |||
344 | 336 | ||
345 | if (irq >= 0) { | 337 | if (irq >= 0) { |
346 | /* request irq */ | 338 | /* request irq */ |
347 | ret = request_irq(irq, parport_ax88796_interrupt, | 339 | ret = request_irq(irq, parport_irq_handler, |
348 | IRQF_TRIGGER_FALLING, pdev->name, pp); | 340 | IRQF_TRIGGER_FALLING, pdev->name, pp); |
349 | 341 | ||
350 | if (ret < 0) | 342 | if (ret < 0) |