Commit-ID:  1a5595cb288411840298f25dc3d8944a90e4b5ab
Gitweb:     http://git.kernel.org/tip/1a5595cb288411840298f25dc3d8944a90e4b5ab
Author:     Javier Martinez Canillas <[email protected]>
AuthorDate: Fri, 14 Jun 2013 18:40:46 +0200
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Tue, 25 Jun 2013 11:48:25 +0200

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 <[email protected]>
Acked-by: Grant Likely <[email protected]>
Acked-by: Linus Walleij <[email protected]>
Acked-by: Samuel Ortiz <[email protected]>
Cc: Jason Cooper <[email protected]>
Cc: Andrew Lunn <[email protected]>
Cc: Russell King <[email protected]>
Cc: Ralf Baechle <[email protected]>
Cc: Benjamin Herrenschmidt <[email protected]>
Cc: [email protected]
Cc: [email protected]
Link: 
http://lkml.kernel.org/r/1371228049-27080-5-git-send-email-javier.marti...@collabora.co.uk
Signed-off-by: Thomas Gleixner <[email protected]>
---
 drivers/mfd/stmpe.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c
index bbccd51..5d5e6f9 100644
--- a/drivers/mfd/stmpe.c
+++ b/drivers/mfd/stmpe.c
@@ -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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to