diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2011-02-06 14:32:28 +0000 |
|---|---|---|
| committer |   Matt Turner <mattst88@gmail.com> | 2011-03-02 14:57:55 -0500 |
| commit | ff53afe66a3ab5614309a4193df72c82ec3bb984 (patch) | |
| tree | 59e65c6069a0bd4277fb2ba118cc146c8d6d8c0b /arch/alpha/kernel/sys_jensen.c | |
| parent | alpha: srm: Convert irq_chip functions (diff) | |
| download | linux-dev-ff53afe66a3ab5614309a4193df72c82ec3bb984.tar.xz linux-dev-ff53afe66a3ab5614309a4193df72c82ec3bb984.zip | |
alpha: i8259, alcor, jensen wildfire: Convert irq_chip
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'arch/alpha/kernel/sys_jensen.c')
| -rw-r--r-- | arch/alpha/kernel/sys_jensen.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/arch/alpha/kernel/sys_jensen.c b/arch/alpha/kernel/sys_jensen.c index 34f55e03d331..00341b75c8b2 100644 --- a/arch/alpha/kernel/sys_jensen.c +++ b/arch/alpha/kernel/sys_jensen.c @@ -63,34 +63,34 @@ */ static void -jensen_local_enable(unsigned int irq) +jensen_local_enable(struct irq_data *d) { /* the parport is really hw IRQ 1, silly Jensen. */ - if (irq == 7) - i8259a_enable_irq(1); + if (d->irq == 7) + i8259a_enable_irq(d); } static void -jensen_local_disable(unsigned int irq) +jensen_local_disable(struct irq_data *d) { /* the parport is really hw IRQ 1, silly Jensen. */ - if (irq == 7) - i8259a_disable_irq(1); + if (d->irq == 7) + i8259a_disable_irq(d); } static void -jensen_local_mask_ack(unsigned int irq) +jensen_local_mask_ack(struct irq_data *d) { /* the parport is really hw IRQ 1, silly Jensen. */ - if (irq == 7) - i8259a_mask_and_ack_irq(1); + if (d->irq == 7) + i8259a_mask_and_ack_irq(d); } static struct irq_chip jensen_local_irq_type = { .name = "LOCAL", - .unmask = jensen_local_enable, - .mask = jensen_local_disable, - .mask_ack = jensen_local_mask_ack, + .irq_unmask = jensen_local_enable, + .irq_mask = jensen_local_disable, + .irq_mask_ack = jensen_local_mask_ack, }; static void |