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_sunbpp.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_sunbpp.c')
-rw-r--r-- | drivers/parport/parport_sunbpp.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/parport/parport_sunbpp.c b/drivers/parport/parport_sunbpp.c index d27019c2f860..9d595aa91e46 100644 --- a/drivers/parport/parport_sunbpp.c +++ b/drivers/parport/parport_sunbpp.c | |||
@@ -46,12 +46,6 @@ | |||
46 | #define dprintk(x) | 46 | #define dprintk(x) |
47 | #endif | 47 | #endif |
48 | 48 | ||
49 | static irqreturn_t parport_sunbpp_interrupt(int irq, void *dev_id) | ||
50 | { | ||
51 | parport_generic_irq(irq, (struct parport *) dev_id); | ||
52 | return IRQ_HANDLED; | ||
53 | } | ||
54 | |||
55 | static void parport_sunbpp_disable_irq(struct parport *p) | 49 | static void parport_sunbpp_disable_irq(struct parport *p) |
56 | { | 50 | { |
57 | struct bpp_regs __iomem *regs = (struct bpp_regs __iomem *)p->base; | 51 | struct bpp_regs __iomem *regs = (struct bpp_regs __iomem *)p->base; |
@@ -324,7 +318,7 @@ static int __devinit init_one_port(struct sbus_dev *sdev) | |||
324 | p->size = size; | 318 | p->size = size; |
325 | p->dev = &sdev->ofdev.dev; | 319 | p->dev = &sdev->ofdev.dev; |
326 | 320 | ||
327 | if ((err = request_irq(p->irq, parport_sunbpp_interrupt, | 321 | if ((err = request_irq(p->irq, parport_irq_handler, |
328 | IRQF_SHARED, p->name, p)) != 0) { | 322 | IRQF_SHARED, p->name, p)) != 0) { |
329 | goto out_put_port; | 323 | goto out_put_port; |
330 | } | 324 | } |