aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorJavier Martinez Canillas <javier.martinez@collabora.co.uk>2013-06-14 12:40:45 -0400
committerThomas Gleixner <tglx@linutronix.de>2013-06-25 05:48:25 -0400
commit5dbf79d496f3a9ad141dfd1ce4a9c4d7e12c9e2c (patch)
treeaf5d2394f8d18aa71ed32c8bf812ccc7f47f3169 /drivers/mfd
parentfb90c22ab5e926bd35526f197097793cf479b254 (diff)
mfd: twl4030-irq: 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> Acked-by: Grant Likely <grant.likely@linaro.org> Cc: Linus Walleij <linus.walleij@linaro.org> Acked-by: Samuel Ortiz <sameo@linux.intel.com> Cc: 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-4-git-send-email-javier.martinez@collabora.co.uk Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/twl4030-irq.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
index a5f9888aa19c..9d2d1bad6780 100644
--- a/drivers/mfd/twl4030-irq.c
+++ b/drivers/mfd/twl4030-irq.c
@@ -537,16 +537,13 @@ static void twl4030_sih_bus_sync_unlock(struct irq_data *data)
537 /* Modify only the bits we know must change */ 537 /* Modify only the bits we know must change */
538 while (edge_change) { 538 while (edge_change) {
539 int i = fls(edge_change) - 1; 539 int i = fls(edge_change) - 1;
540 struct irq_data *idata;
541 int byte = i >> 2; 540 int byte = i >> 2;
542 int off = (i & 0x3) * 2; 541 int off = (i & 0x3) * 2;
543 unsigned int type; 542 unsigned int type;
544 543
545 idata = irq_get_irq_data(i + agent->irq_base);
546
547 bytes[byte] &= ~(0x03 << off); 544 bytes[byte] &= ~(0x03 << off);
548 545
549 type = irqd_get_trigger_type(idata); 546 type = irq_get_trigger_type(i + agent->irq_base);
550 if (type & IRQ_TYPE_EDGE_RISING) 547 if (type & IRQ_TYPE_EDGE_RISING)
551 bytes[byte] |= BIT(off + 1); 548 bytes[byte] |= BIT(off + 1);
552 if (type & IRQ_TYPE_EDGE_FALLING) 549 if (type & IRQ_TYPE_EDGE_FALLING)