git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
[pandora-kernel.git]
/
arch
/
arm
/
plat-omap
/
gpio.c
diff --git
a/arch/arm/plat-omap/gpio.c
b/arch/arm/plat-omap/gpio.c
index
bd9e321
..
efb8693
100644
(file)
--- a/
arch/arm/plat-omap/gpio.c
+++ b/
arch/arm/plat-omap/gpio.c
@@
-1137,8
+1137,9
@@
static void gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
struct gpio_bank *bank;
u32 retrigger = 0;
int unmasked = 0;
struct gpio_bank *bank;
u32 retrigger = 0;
int unmasked = 0;
+ struct irq_chip *chip = irq_desc_get_chip(desc);
-
desc->irq_data.chip->irq_ack(&desc->irq_data
);
+
chained_irq_enter(chip, desc
);
bank = irq_get_handler_data(irq);
#ifdef CONFIG_ARCH_OMAP1
bank = irq_get_handler_data(irq);
#ifdef CONFIG_ARCH_OMAP1
@@
-1195,7
+1196,7
@@
static void gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
configured, we could unmask GPIO bank interrupt immediately */
if (!level_mask && !unmasked) {
unmasked = 1;
configured, we could unmask GPIO bank interrupt immediately */
if (!level_mask && !unmasked) {
unmasked = 1;
-
desc->irq_data.chip->irq_unmask(&desc->irq_data
);
+
chained_irq_exit(chip, desc
);
}
isr |= retrigger;
}
isr |= retrigger;
@@
-1231,7
+1232,7
@@
static void gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
interrupt */
exit:
if (!unmasked)
interrupt */
exit:
if (!unmasked)
-
desc->irq_data.chip->irq_unmask(&desc->irq_data
);
+
chained_irq_exit(chip, desc
);
}
static void gpio_irq_shutdown(struct irq_data *d)
}
static void gpio_irq_shutdown(struct irq_data *d)