Commit 1a5595cb authored Jun 14, 2013 by Javier Martinez Canillas Committed by Thomas Gleixner Jun 25, 2013

mfd: stmpe: 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>
Acked-by: 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-5-git-send-email-javier.martinez@collabora.co.uk


Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent 5dbf79d4

drivers/mfd/stmpe.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1208,8 +1208,7 @@ int stmpe_probe(struct stmpe_client_info *ci, int partnum)
		}
		stmpe->variant = stmpe_noirq_variant_info[stmpe->partnum];
		} else if (pdata->irq_trigger == IRQF_TRIGGER_NONE) {
		pdata->irq_trigger =
		irqd_get_trigger_type(irq_get_irq_data(stmpe->irq));
		pdata->irq_trigger = irq_get_trigger_type(stmpe->irq);
		}

		ret = stmpe_chip_init(stmpe);