summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/ams-delta-fiq.c
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2010-11-29 10:39:27 +0100
committerLennert Buytenhek <buytenh@wantstofly.org>2011-01-13 17:18:51 +0100
commita51eef7eb45f7d0b141cf5b3729075e97992046b (patch)
treead2cae519aa27ecf6bafffa3900e57f9d2b00f80 /arch/arm/mach-omap1/ams-delta-fiq.c
parent85dcd90ce11d24649906adc454f31f1ac3f2dc6a (diff)
downloadlinux-a51eef7eb45f7d0b141cf5b3729075e97992046b.tar.bz2
ARM: omap1: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Diffstat (limited to 'arch/arm/mach-omap1/ams-delta-fiq.c')
-rw-r--r--arch/arm/mach-omap1/ams-delta-fiq.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-omap1/ams-delta-fiq.c b/arch/arm/mach-omap1/ams-delta-fiq.c
index 6c994e2d8879..152b32c15e28 100644
--- a/arch/arm/mach-omap1/ams-delta-fiq.c
+++ b/arch/arm/mach-omap1/ams-delta-fiq.c
@@ -49,7 +49,7 @@ static irqreturn_t deferred_fiq(int irq, void *dev_id)
irq_desc = irq_to_desc(IH_GPIO_BASE);
if (irq_desc)
- irq_chip = irq_desc->chip;
+ irq_chip = irq_desc->irq_data.chip;
/*
* For each handled GPIO interrupt, keep calling its interrupt handler
@@ -62,13 +62,15 @@ static irqreturn_t deferred_fiq(int irq, void *dev_id)
while (irq_counter[gpio] < fiq_count) {
if (gpio != AMS_DELTA_GPIO_PIN_KEYBRD_CLK) {
+ struct irq_data *d = irq_get_irq_data(irq_num);
+
/*
* It looks like handle_edge_irq() that
* OMAP GPIO edge interrupts default to,
* expects interrupt already unmasked.
*/
- if (irq_chip && irq_chip->unmask)
- irq_chip->unmask(irq_num);
+ if (irq_chip && irq_chip->irq_unmask)
+ irq_chip->irq_unmask(d);
}
generic_handle_irq(irq_num);