diff options
| author | Kyle McMartin <kyle@dreadnought.i.jkkm.org> | 2010-10-13 21:00:55 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@dreadnought.i.jkkm.org> | 2010-10-14 01:30:11 -0400 |
| commit | ba20085c20f1c9e8af546dea6ad0efa421bdef32 (patch) | |
| tree | a5f0574f6b1e60526eb7d1b1e1a50125f10d463c /drivers/parisc/eisa.c | |
| parent | caf96194c05cd97ce96546fbcb1f35ec06aaaac7 (diff) | |
| download | blackbird-op-linux-ba20085c20f1c9e8af546dea6ad0efa421bdef32.tar.gz blackbird-op-linux-ba20085c20f1c9e8af546dea6ad0efa421bdef32.zip | |
parisc: lay groundwork for killing __do_IRQ
Use proper accessors and handlers for generic irq cleanups. We just
call back into __do_IRQ through desc->handler now, and remove the
explicit calls.
Signed-off-by: Kyle McMartin <kyle@redhat.com>
Diffstat (limited to 'drivers/parisc/eisa.c')
| -rw-r--r-- | drivers/parisc/eisa.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/parisc/eisa.c b/drivers/parisc/eisa.c index 46f503fb7fc5..585417702211 100644 --- a/drivers/parisc/eisa.c +++ b/drivers/parisc/eisa.c @@ -233,7 +233,7 @@ static irqreturn_t eisa_irq(int wax_irq, void *intr_dev) } spin_unlock_irqrestore(&eisa_irq_lock, flags); - __do_IRQ(irq); + generic_handle_irq(irq); spin_lock_irqsave(&eisa_irq_lock, flags); /* unmask */ @@ -346,10 +346,10 @@ static int __init eisa_probe(struct parisc_device *dev) } /* Reserve IRQ2 */ - irq_to_desc(2)->action = &irq2_action; - + setup_irq(2, &irq2_action); for (i = 0; i < 16; i++) { - irq_to_desc(i)->chip = &eisa_interrupt_type; + set_irq_chip_and_handler(i, &eisa_interrupt_type, + parisc_do_IRQ); } EISA_bus = 1; |
