aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/parport/parport_gsc.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_gsc.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_gsc.c')
-rw-r--r--drivers/parport/parport_gsc.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/parport/parport_gsc.c b/drivers/parport/parport_gsc.c
index 43652ba523eb..0e77ae2b71a0 100644
--- a/drivers/parport/parport_gsc.c
+++ b/drivers/parport/parport_gsc.c
@@ -80,12 +80,6 @@ static int clear_epp_timeout(struct parport *pb)
80 * of these are in parport_gsc.h. 80 * of these are in parport_gsc.h.
81 */ 81 */
82 82
83static irqreturn_t parport_gsc_interrupt(int irq, void *dev_id)
84{
85 parport_generic_irq(irq, (struct parport *) dev_id);
86 return IRQ_HANDLED;
87}
88
89void parport_gsc_init_state(struct pardevice *dev, struct parport_state *s) 83void parport_gsc_init_state(struct pardevice *dev, struct parport_state *s)
90{ 84{
91 s->u.pc.ctr = 0xc | (dev->irq_func ? 0x10 : 0x0); 85 s->u.pc.ctr = 0xc | (dev->irq_func ? 0x10 : 0x0);
@@ -324,7 +318,7 @@ struct parport *__devinit parport_gsc_probe_port (unsigned long base,
324 printk("]\n"); 318 printk("]\n");
325 319
326 if (p->irq != PARPORT_IRQ_NONE) { 320 if (p->irq != PARPORT_IRQ_NONE) {
327 if (request_irq (p->irq, parport_gsc_interrupt, 321 if (request_irq (p->irq, parport_irq_handler,
328 0, p->name, p)) { 322 0, p->name, p)) {
329 printk (KERN_WARNING "%s: irq %d in use, " 323 printk (KERN_WARNING "%s: irq %d in use, "
330 "resorting to polled operation\n", 324 "resorting to polled operation\n",