[ARM] Convert request_irq+set_irq_type to request_irq with SA_TRIGGER

There's no need to have request_irq followed by set_irq_type.
Just use request_irq with the appropriate SA_TRIGGER flags.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 3 insertions, 6 deletions

diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index dd8c6a9ffc76..b45a45ca7cc9 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -29,9 +29,6 @@
 #ifdef  CONFIG_ARCH_OMAP
 #include <asm/arch/gpio.h>
 #endif
-
-#else
-#define set_irq_type(irq,type)  do{}while(0)
 #endif
 
 
@@ -509,14 +506,14 @@ static int __devinit ads7846_probe(struct spi_device *spi)
         ts->msg.complete = ads7846_rx;
         ts->msg.context = ts;
 
-        if (request_irq(spi->irq, ads7846_irq, SA_SAMPLE_RANDOM,
-                                spi->dev.bus_id, ts)) {
+        if (request_irq(spi->irq, ads7846_irq,
+                        SA_SAMPLE_RANDOM | SA_TRIGGER_FALLING,
+                        spi->dev.bus_id, ts)) {
                 dev_dbg(&spi->dev, "irq %d busy?\n", spi->irq);
                 input_unregister_device(&ts->input);
                 kfree(ts);
                 return -EBUSY;
         }
-        set_irq_type(spi->irq, IRQT_FALLING);
 
         dev_info(&spi->dev, "touchscreen, irq %d\n", spi->irq);