[PATCH] irq-flags: misc drivers: Use the new IRQF_ constants

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

5 files changed, 9 insertions, 9 deletions

diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index de93601de178..377ab40944b8 100644
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -318,7 +318,7 @@ static int fsl_i2c_probe(struct platform_device *pdev)
 
         if (i2c->irq != 0)
                 if ((result = request_irq(i2c->irq, mpc_i2c_isr,
-                                          SA_SHIRQ, "i2c-mpc", i2c)) < 0) {
+                                          IRQF_SHARED, "i2c-mpc", i2c)) < 0) {
                         printk(KERN_ERR
                                "i2c-mpc - failed to attach interrupt\n");
                         goto fail_irq;
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 5155010b455e..ee114b48face 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -968,7 +968,7 @@ static int i2c_pxa_probe(struct platform_device *dev)
 #endif
 
         pxa_set_cken(CKEN14_I2C, 1);
-        ret = request_irq(IRQ_I2C, i2c_pxa_handler, SA_INTERRUPT,
+        ret = request_irq(IRQ_I2C, i2c_pxa_handler, IRQF_DISABLED,
                           "pxa2xx-i2c", i2c);
         if (ret)
                 goto out;
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index 512b8791c328..5d2950e91fc5 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -828,7 +828,7 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
                 goto out;
         }
 
-        ret = request_irq(res->start, s3c24xx_i2c_irq, SA_INTERRUPT,
+        ret = request_irq(res->start, s3c24xx_i2c_irq, IRQF_DISABLED,
                           pdev->name, i2c);
 
         if (ret != 0) {
diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c
index b638ac6e59f4..f92505b94c61 100644
--- a/drivers/i2c/chips/isp1301_omap.c
+++ b/drivers/i2c/chips/isp1301_omap.c
@@ -908,7 +908,7 @@ static int otg_bind(struct isp1301 *isp)
 
         if (otg_dev)
                 status = request_irq(otg_dev->resource[1].start, omap_otg_irq,
-                                SA_INTERRUPT, DRIVER_NAME, isp);
+                                IRQF_DISABLED, DRIVER_NAME, isp);
         else
                 status = -ENODEV;
 
@@ -1578,7 +1578,7 @@ fail1:
         }
 
         status = request_irq(isp->irq, isp1301_irq,
-                        SA_SAMPLE_RANDOM, DRIVER_NAME, isp);
+                        IRQF_SAMPLE_RANDOM, DRIVER_NAME, isp);
         if (status < 0) {
                 dev_dbg(&i2c->dev, "can't get IRQ %d, err %d\n",
                                 isp->irq, status);
diff --git a/drivers/i2c/chips/tps65010.c b/drivers/i2c/chips/tps65010.c
index e27ee12245d3..e7e27049fbfa 100644
--- a/drivers/i2c/chips/tps65010.c
+++ b/drivers/i2c/chips/tps65010.c
@@ -521,14 +521,14 @@ tps65010_probe(struct i2c_adapter *bus, int address, int kind)
         }
 
 #ifdef  CONFIG_ARM
-        irqflags = SA_SAMPLE_RANDOM | SA_TRIGGER_LOW;
+        irqflags = IRQF_SAMPLE_RANDOM | IRQF_TRIGGER_LOW;
         if (machine_is_omap_h2()) {
                 tps->model = TPS65010;
                 omap_cfg_reg(W4_GPIO58);
                 tps->irq = OMAP_GPIO_IRQ(58);
                 omap_request_gpio(58);
                 omap_set_gpio_direction(58, 1);
-                irqflags |= SA_TRIGGER_FALLING;
+                irqflags |= IRQF_TRIGGER_FALLING;
         }
         if (machine_is_omap_osk()) {
                 tps->model = TPS65010;
@@ -536,7 +536,7 @@ tps65010_probe(struct i2c_adapter *bus, int address, int kind)
                 tps->irq = OMAP_GPIO_IRQ(OMAP_MPUIO(1));
                 omap_request_gpio(OMAP_MPUIO(1));
                 omap_set_gpio_direction(OMAP_MPUIO(1), 1);
-                irqflags |= SA_TRIGGER_FALLING;
+                irqflags |= IRQF_TRIGGER_FALLING;
         }
         if (machine_is_omap_h3()) {
                 tps->model = TPS65013;
@@ -544,7 +544,7 @@ tps65010_probe(struct i2c_adapter *bus, int address, int kind)
                 // FIXME set up this board's IRQ ...
         }
 #else
-        irqflags = SA_SAMPLE_RANDOM;
+        irqflags = IRQF_SAMPLE_RANDOM;
 #endif
 
         if (tps->irq > 0) {