diff options
| author | Kyle McMartin <kyle@redhat.com> | 2010-10-15 04:31:11 +0200 |
|---|---|---|
| committer | Matt Turner <mattst88@monolith.freenet-rz.de> | 2011-01-17 05:42:11 +0100 |
| commit | d5ccde0a64c3dbe954a8a13a6ba9fb3b6d7c6225 (patch) | |
| tree | 00a7c1a1fc1fa42fdc88bdab8a30e40e3dcaa775 /arch/alpha/kernel/sys_cabriolet.c | |
| parent | drivers/nfc/pn544.c: fix min_t warnings (diff) | |
| download | linux-d5ccde0a64c3dbe954a8a13a6ba9fb3b6d7c6225.tar.xz linux-d5ccde0a64c3dbe954a8a13a6ba9fb3b6d7c6225.zip | |
alpha: use set_irq_chip and push down __do_IRQ to the machine types
Also kill superfluous IRQ_DISABLED initialization, since that's the
default state of the irq_desc[i].status field.
Tested-by: Michael Cree <mcree@orcon.net.nz>
Signed-off-by: Kyle McMartin <kyle@redhat.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'arch/alpha/kernel/sys_cabriolet.c')
| -rw-r--r-- | arch/alpha/kernel/sys_cabriolet.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/alpha/kernel/sys_cabriolet.c b/arch/alpha/kernel/sys_cabriolet.c index 14c8898d19ec..ba38fcd347d6 100644 --- a/arch/alpha/kernel/sys_cabriolet.c +++ b/arch/alpha/kernel/sys_cabriolet.c @@ -122,8 +122,9 @@ common_init_irq(void (*srm_dev_int)(unsigned long v)) outb(0xff, 0x806); for (i = 16; i < 35; ++i) { - irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL; - irq_desc[i].chip = &cabriolet_irq_type; + set_irq_chip_and_handler(i, &cabriolet_irq_type, + alpha_do_IRQ); + irq_desc[i].status |= IRQ_LEVEL; } } |