Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux

[cascardo/linux.git] / drivers / mfd / stmpe.c

diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c
index bbccd51..5d5e6f9 100644 (file)
--- 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);