Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Javier Martinez Canillas and committed by
Thomas Gleixner
5dbf79d4 fb90c22a

+1 -4
+1 -4
drivers/mfd/twl4030-irq.c
··· 537 537 /* Modify only the bits we know must change */ 538 538 while (edge_change) { 539 539 int i = fls(edge_change) - 1; 540 - struct irq_data *idata; 541 540 int byte = i >> 2; 542 541 int off = (i & 0x3) * 2; 543 542 unsigned int type; 544 543 545 - idata = irq_get_irq_data(i + agent->irq_base); 546 - 547 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 547 if (type & IRQ_TYPE_EDGE_RISING) 551 548 bytes[byte] |= BIT(off + 1); 552 549 if (type & IRQ_TYPE_EDGE_FALLING)