Merge tag 'nfs-rdma-for-4.3-2' of git://git.linux-nfs.org/projects/anna/nfs-rdma

[karo-tx-linux.git] / drivers / mfd / stmpe.c

diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c
index 18c4d72d1d2a93b50a049c28d838eacc80ba7dd1..e971af86ce1ef7e495d47364aeee15f5c10b76a1 100644 (file)
--- a/drivers/mfd/stmpe.c
+++ b/drivers/mfd/stmpe.c
@@ -971,20 +971,13 @@ static int stmpe_irq_map(struct irq_domain *d, unsigned int virq,
        irq_set_chip_data(virq, stmpe);
        irq_set_chip_and_handler(virq, chip, handle_edge_irq);
        irq_set_nested_thread(virq, 1);
-#ifdef CONFIG_ARM
-       set_irq_flags(virq, IRQF_VALID);
-#else
        irq_set_noprobe(virq);
-#endif
 
        return 0;
 }
 
 static void stmpe_irq_unmap(struct irq_domain *d, unsigned int virq)
 {
-#ifdef CONFIG_ARM
-               set_irq_flags(virq, 0);
-#endif
                irq_set_chip_and_handler(virq, NULL, NULL);
                irq_set_chip_data(virq, NULL);
 }