diff options
| author | Kyle McMartin <kyle@redhat.com> | 2010-10-15 04:31:34 +0200 |
|---|---|---|
| committer | Matt Turner <mattst88@monolith.freenet-rz.de> | 2011-01-17 05:42:13 +0100 |
| commit | 7d209c8110ecd49db46da786437485e8ef67f414 (patch) | |
| tree | bc550d6f1a7933a56194390255c5b836e41817a7 /arch/alpha/kernel/sys_titan.c | |
| parent | alpha: irq clean up (diff) | |
| download | linux-7d209c8110ecd49db46da786437485e8ef67f414.tar.xz linux-7d209c8110ecd49db46da786437485e8ef67f414.zip | |
alpha: kill off alpha_do_IRQ
Good riddance... Nuke a pile of redundant handlers that the
generic code takes care of as well.
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_titan.c')
| -rw-r--r-- | arch/alpha/kernel/sys_titan.c | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/arch/alpha/kernel/sys_titan.c b/arch/alpha/kernel/sys_titan.c index 9870f3daa73f..e02494bf5ef3 100644 --- a/arch/alpha/kernel/sys_titan.c +++ b/arch/alpha/kernel/sys_titan.c @@ -129,20 +129,6 @@ titan_disable_irq(unsigned int irq) spin_unlock(&titan_irq_lock); } -static unsigned int -titan_startup_irq(unsigned int irq) -{ - titan_enable_irq(irq); - return 0; /* never anything pending */ -} - -static void -titan_end_irq(unsigned int irq) -{ - if (!(irq_to_desc(irq)->status & (IRQ_DISABLED|IRQ_INPROGRESS))) - titan_enable_irq(irq); -} - static void titan_cpu_set_irq_affinity(unsigned int irq, cpumask_t affinity) { @@ -190,19 +176,16 @@ init_titan_irqs(struct irq_chip * ops, int imin, int imax) long i; for (i = imin; i <= imax; ++i) { irq_to_desc(i)->status |= IRQ_LEVEL; - set_irq_chip_and_handler(i, ops, alpha_do_IRQ); + set_irq_chip_and_handler(i, ops, handle_level_irq); } } static struct irq_chip titan_irq_type = { - .name = "TITAN", - .startup = titan_startup_irq, - .shutdown = titan_disable_irq, - .enable = titan_enable_irq, - .disable = titan_disable_irq, - .ack = titan_disable_irq, - .end = titan_end_irq, - .set_affinity = titan_set_irq_affinity, + .name = "TITAN", + .unmask = titan_enable_irq, + .mask = titan_disable_irq, + .mask_ack = titan_disable_irq, + .set_affinity = titan_set_irq_affinity, }; static irqreturn_t |