diff options
author | Javier Martinez Canillas <javier.martinez@collabora.co.uk> | 2013-06-14 12:40:47 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2013-06-25 05:48:25 -0400 |
commit | f88704c95b5a2634eff99e2d720031555c67fe81 (patch) | |
tree | 3505ee647fabb79e2da8e2b1510349a68f187914 /arch/arm/plat-orion | |
parent | 1a5595cb288411840298f25dc3d8944a90e4b5ab (diff) |
arm: orion: Use irq_get_trigger_type() to get IRQ flags
Use irq_get_trigger_type() to get the IRQ trigger type flags
instead calling irqd_get_trigger_type(irq_get_irq_data(irq))
Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Acked-by: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-mips@linux-mips.org
Link: http://lkml.kernel.org/r/1371228049-27080-6-git-send-email-javier.martinez@collabora.co.uk
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/arm/plat-orion')
-rw-r--r-- | arch/arm/plat-orion/gpio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-orion/gpio.c b/arch/arm/plat-orion/gpio.c index 249fe6333e18..6816192a7561 100644 --- a/arch/arm/plat-orion/gpio.c +++ b/arch/arm/plat-orion/gpio.c | |||
@@ -426,7 +426,7 @@ static void gpio_irq_handler(unsigned irq, struct irq_desc *desc) | |||
426 | if (!(cause & (1 << i))) | 426 | if (!(cause & (1 << i))) |
427 | continue; | 427 | continue; |
428 | 428 | ||
429 | type = irqd_get_trigger_type(irq_get_irq_data(irq)); | 429 | type = irq_get_trigger_type(irq); |
430 | if ((type & IRQ_TYPE_SENSE_MASK) == IRQ_TYPE_EDGE_BOTH) { | 430 | if ((type & IRQ_TYPE_SENSE_MASK) == IRQ_TYPE_EDGE_BOTH) { |
431 | /* Swap polarity (race with GPIO line) */ | 431 | /* Swap polarity (race with GPIO line) */ |
432 | u32 polarity; | 432 | u32 polarity; |