forked from luck/tmp_suning_uos_patched
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>
This commit is contained in:
parent
fb90c22ab5
commit
5dbf79d496
@ -537,16 +537,13 @@ static void twl4030_sih_bus_sync_unlock(struct irq_data *data)
|
||||
/* Modify only the bits we know must change */
|
||||
while (edge_change) {
|
||||
int i = fls(edge_change) - 1;
|
||||
struct irq_data *idata;
|
||||
int byte = i >> 2;
|
||||
int off = (i & 0x3) * 2;
|
||||
unsigned int type;
|
||||
|
||||
idata = irq_get_irq_data(i + agent->irq_base);
|
||||
|
||||
bytes[byte] &= ~(0x03 << off);
|
||||
|
||||
type = irqd_get_trigger_type(idata);
|
||||
type = irq_get_trigger_type(i + agent->irq_base);
|
||||
if (type & IRQ_TYPE_EDGE_RISING)
|
||||
bytes[byte] |= BIT(off + 1);
|
||||
if (type & IRQ_TYPE_EDGE_FALLING)
|
||||
|
Loading…
Reference in New Issue
Block a user