diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-06 14:32:42 +0000 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2011-03-02 14:57:57 -0500 |
| commit | a326526360622825fd98c05a0eae3087efb0df81 (patch) | |
| tree | 7d24b97a2ba8a400755a2f5a0476e2ffcf90ab3c /arch/alpha/kernel/sys_mikasa.c | |
| parent | 08876fe8519c4f7625efba8aa3d51b1d24cd8a13 (diff) | |
| download | blackbird-obmc-linux-a326526360622825fd98c05a0eae3087efb0df81.tar.gz blackbird-obmc-linux-a326526360622825fd98c05a0eae3087efb0df81.zip | |
alpha: mikasa: Convert irq_chip functions
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'arch/alpha/kernel/sys_mikasa.c')
| -rw-r--r-- | arch/alpha/kernel/sys_mikasa.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/alpha/kernel/sys_mikasa.c b/arch/alpha/kernel/sys_mikasa.c index bcc1639e8efb..cf7f43dd3147 100644 --- a/arch/alpha/kernel/sys_mikasa.c +++ b/arch/alpha/kernel/sys_mikasa.c @@ -43,22 +43,22 @@ mikasa_update_irq_hw(int mask) } static inline void -mikasa_enable_irq(unsigned int irq) +mikasa_enable_irq(struct irq_data *d) { - mikasa_update_irq_hw(cached_irq_mask |= 1 << (irq - 16)); + mikasa_update_irq_hw(cached_irq_mask |= 1 << (d->irq - 16)); } static void -mikasa_disable_irq(unsigned int irq) +mikasa_disable_irq(struct irq_data *d) { - mikasa_update_irq_hw(cached_irq_mask &= ~(1 << (irq - 16))); + mikasa_update_irq_hw(cached_irq_mask &= ~(1 << (d->irq - 16))); } static struct irq_chip mikasa_irq_type = { .name = "MIKASA", - .unmask = mikasa_enable_irq, - .mask = mikasa_disable_irq, - .mask_ack = mikasa_disable_irq, + .irq_unmask = mikasa_enable_irq, + .irq_mask = mikasa_disable_irq, + .irq_mask_ack = mikasa_disable_irq, }; static void @@ -98,8 +98,8 @@ mikasa_init_irq(void) mikasa_update_irq_hw(0); for (i = 16; i < 32; ++i) { - irq_to_desc(i)->status |= IRQ_LEVEL; set_irq_chip_and_handler(i, &mikasa_irq_type, handle_level_irq); + irq_set_status_flags(i, IRQ_LEVEL); } init_i8259a_irqs(); |
