11 files changed, 18 insertions, 18 deletions

diff --git a/drivers/input/keyboard/corgikbd.c b/drivers/input/keyboard/corgikbd.c
index 1f0e720267d7..1e03153b9bca 100644
--- a/drivers/input/keyboard/corgikbd.c
+++ b/drivers/input/keyboard/corgikbd.c
@@ -352,7 +352,7 @@ static int __init corgikbd_probe(struct platform_device *pdev)
         for (i = 0; i < CORGI_KEY_SENSE_NUM; i++) {
                 pxa_gpio_mode(CORGI_GPIO_KEY_SENSE(i) | GPIO_IN);
                 if (request_irq(CORGI_IRQ_GPIO_KEY_SENSE(i), corgikbd_interrupt,
-                                SA_INTERRUPT | SA_TRIGGER_RISING,
+                                IRQF_DISABLED | IRQF_TRIGGER_RISING,
                                 "corgikbd", corgikbd))
                         printk(KERN_WARNING "corgikbd: Can't get IRQ: %d!\n", i);
         }
diff --git a/drivers/input/keyboard/spitzkbd.c b/drivers/input/keyboard/spitzkbd.c
index c5d03fb77bcb..e385710233f4 100644
--- a/drivers/input/keyboard/spitzkbd.c
+++ b/drivers/input/keyboard/spitzkbd.c
@@ -410,7 +410,7 @@ static int __init spitzkbd_probe(struct platform_device *dev)
         for (i = 0; i < SPITZ_KEY_SENSE_NUM; i++) {
                 pxa_gpio_mode(spitz_senses[i] | GPIO_IN);
                 if (request_irq(IRQ_GPIO(spitz_senses[i]), spitzkbd_interrupt,
-                                SA_INTERRUPT|SA_TRIGGER_RISING,
+                                IRQF_DISABLED|IRQF_TRIGGER_RISING,
                                 "Spitzkbd Sense", spitzkbd))
                         printk(KERN_WARNING "spitzkbd: Can't get Sense IRQ: %d!\n", i);
         }
@@ -425,19 +425,19 @@ static int __init spitzkbd_probe(struct platform_device *dev)
         pxa_gpio_mode(SPITZ_GPIO_SWB | GPIO_IN);
 
         request_irq(SPITZ_IRQ_GPIO_SYNC, spitzkbd_interrupt,
-                    SA_INTERRUPT | SA_TRIGGER_RISING | SA_TRIGGER_FALLING,
+                    IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
                     "Spitzkbd Sync", spitzkbd);
         request_irq(SPITZ_IRQ_GPIO_ON_KEY, spitzkbd_interrupt,
-                    SA_INTERRUPT | SA_TRIGGER_RISING | SA_TRIGGER_FALLING,
+                    IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
                     "Spitzkbd PwrOn", spitzkbd);
         request_irq(SPITZ_IRQ_GPIO_SWA, spitzkbd_hinge_isr,
-                    SA_INTERRUPT | SA_TRIGGER_RISING | SA_TRIGGER_FALLING,
+                    IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
                     "Spitzkbd SWA", spitzkbd);
         request_irq(SPITZ_IRQ_GPIO_SWB, spitzkbd_hinge_isr,
-                    SA_INTERRUPT | SA_TRIGGER_RISING | SA_TRIGGER_FALLING,
+                    IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
                     "Spitzkbd SWB", spitzkbd);
         request_irq(SPITZ_IRQ_GPIO_AK_INT, spitzkbd_hinge_isr,
-                    SA_INTERRUPT | SA_TRIGGER_RISING | SA_TRIGGER_FALLING,
+                    IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
                     "Spitzkbd HP", spitzkbd);
 
         printk(KERN_INFO "input: Spitz Keyboard Registered\n");
diff --git a/drivers/input/misc/ixp4xx-beeper.c b/drivers/input/misc/ixp4xx-beeper.c
index 3a6ae85cd69c..805b636e73d9 100644
--- a/drivers/input/misc/ixp4xx-beeper.c
+++ b/drivers/input/misc/ixp4xx-beeper.c
@@ -113,7 +113,7 @@ static int __devinit ixp4xx_spkr_probe(struct platform_device *dev)
         input_dev->event = ixp4xx_spkr_event;
 
         err = request_irq(IRQ_IXP4XX_TIMER2, &ixp4xx_spkr_interrupt,
-                          SA_INTERRUPT | SA_TIMER, "ixp4xx-beeper", (void *) dev->id);
+                          IRQF_DISABLED | IRQF_TIMER, "ixp4xx-beeper", (void *) dev->id);
         if (err)
                 goto err_free_device;
 
diff --git a/drivers/input/mouse/rpcmouse.c b/drivers/input/mouse/rpcmouse.c
index 09b6ffdb7582..872b30bf7aad 100644
--- a/drivers/input/mouse/rpcmouse.c
+++ b/drivers/input/mouse/rpcmouse.c
@@ -85,7 +85,7 @@ static int __init rpcmouse_init(void)
         rpcmouse_lastx = (short) iomd_readl(IOMD_MOUSEX);
         rpcmouse_lasty = (short) iomd_readl(IOMD_MOUSEY);
 
-        if (request_irq(IRQ_VSYNCPULSE, rpcmouse_irq, SA_SHIRQ, "rpcmouse", rpcmouse_dev)) {
+        if (request_irq(IRQ_VSYNCPULSE, rpcmouse_irq, IRQF_SHARED, "rpcmouse", rpcmouse_dev)) {
                 printk(KERN_ERR "rpcmouse: unable to allocate VSYNC interrupt\n");
                 input_free_device(rpcmouse_dev);
                 return -EBUSY;
diff --git a/drivers/input/serio/gscps2.c b/drivers/input/serio/gscps2.c
index 22d02d53eb16..cde036a92168 100644
--- a/drivers/input/serio/gscps2.c
+++ b/drivers/input/serio/gscps2.c
@@ -370,7 +370,7 @@ static int __init gscps2_probe(struct parisc_device *dev)
         serio->dev.parent       = &dev->dev;
 
         ret = -EBUSY;
-        if (request_irq(dev->irq, gscps2_interrupt, SA_SHIRQ, ps2port->port->name, ps2port))
+        if (request_irq(dev->irq, gscps2_interrupt, IRQF_SHARED, ps2port->port->name, ps2port))
                 goto fail_miserably;
 
         if (ps2port->id != GSC_ID_KEYBOARD && ps2port->id != GSC_ID_MOUSE) {
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index 7fa4bc222583..06a3f25657dd 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -328,7 +328,7 @@ static int i8042_open(struct serio *serio)
                         return 0;
 
         if (request_irq(port->irq, i8042_interrupt,
-                        SA_SHIRQ, "i8042", i8042_request_irq_cookie)) {
+                        IRQF_SHARED, "i8042", i8042_request_irq_cookie)) {
                 printk(KERN_ERR "i8042.c: Can't get irq %d for %s, unregistering the port.\n", port->irq, port->name);
                 goto irq_fail;
         }
@@ -610,7 +610,7 @@ static int __devinit i8042_check_aux(void)
  */
 
         if (request_irq(i8042_ports[I8042_AUX_PORT_NO].irq, i8042_interrupt,
-                        SA_SHIRQ, "i8042", &i8042_check_aux_cookie))
+                        IRQF_SHARED, "i8042", &i8042_check_aux_cookie))
                 return -1;
         free_irq(i8042_ports[I8042_AUX_PORT_NO].irq, &i8042_check_aux_cookie);
 
diff --git a/drivers/input/serio/pcips2.c b/drivers/input/serio/pcips2.c
index 1e139c5e59de..fb727c665253 100644
--- a/drivers/input/serio/pcips2.c
+++ b/drivers/input/serio/pcips2.c
@@ -107,7 +107,7 @@ static int pcips2_open(struct serio *io)
         outb(PS2_CTRL_ENABLE, ps2if->base);
         pcips2_flush_input(ps2if);
 
-        ret = request_irq(ps2if->dev->irq, pcips2_interrupt, SA_SHIRQ,
+        ret = request_irq(ps2if->dev->irq, pcips2_interrupt, IRQF_SHARED,
                           "pcips2", ps2if);
         if (ret == 0)
                 val = PS2_CTRL_ENABLE | PS2_CTRL_RXIRQ;
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index 386023c594d7..66e411badf70 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -773,7 +773,7 @@ static int __devinit ads7846_probe(struct spi_device *spi)
 
         ts->last_msg = m;
 
-        if (request_irq(spi->irq, ads7846_irq, SA_TRIGGER_FALLING,
+        if (request_irq(spi->irq, ads7846_irq, IRQF_TRIGGER_FALLING,
                         spi->dev.driver->name, ts)) {
                 dev_dbg(&spi->dev, "irq %d busy?\n", spi->irq);
                 err = -EBUSY;
diff --git a/drivers/input/touchscreen/corgi_ts.c b/drivers/input/touchscreen/corgi_ts.c
index 5013703db0e6..d2f9759cd3ed 100644
--- a/drivers/input/touchscreen/corgi_ts.c
+++ b/drivers/input/touchscreen/corgi_ts.c
@@ -318,7 +318,7 @@ static int __init corgits_probe(struct platform_device *pdev)
         corgi_ssp_ads7846_putget((5u << ADSCTRL_ADR_SH) | ADSCTRL_STS);
         mdelay(5);
 
-        if (request_irq(corgi_ts->irq_gpio, ts_interrupt, SA_INTERRUPT, "ts", corgi_ts)) {
+        if (request_irq(corgi_ts->irq_gpio, ts_interrupt, IRQF_DISABLED, "ts", corgi_ts)) {
                 err = -EBUSY;
                 goto fail;
         }
diff --git a/drivers/input/touchscreen/h3600_ts_input.c b/drivers/input/touchscreen/h3600_ts_input.c
index 2de2139f2fed..e2b910018773 100644
--- a/drivers/input/touchscreen/h3600_ts_input.c
+++ b/drivers/input/touchscreen/h3600_ts_input.c
@@ -399,14 +399,14 @@ static int h3600ts_connect(struct serio *serio, struct serio_driver *drv)
         set_GPIO_IRQ_edge(GPIO_BITSY_NPOWER_BUTTON, GPIO_RISING_EDGE);
 
         if (request_irq(IRQ_GPIO_BITSY_ACTION_BUTTON, action_button_handler,
-                        SA_SHIRQ | SA_INTERRUPT, "h3600_action", &ts->dev)) {
+                        IRQF_SHARED | IRQF_DISABLED, "h3600_action", &ts->dev)) {
                 printk(KERN_ERR "h3600ts.c: Could not allocate Action Button IRQ!\n");
                 err = -EBUSY;
                 goto fail2;
         }
 
         if (request_irq(IRQ_GPIO_BITSY_NPOWER_BUTTON, npower_button_handler,
-                        SA_SHIRQ | SA_INTERRUPT, "h3600_suspend", &ts->dev)) {
+                        IRQF_SHARED | IRQF_DISABLED, "h3600_suspend", &ts->dev)) {
                 printk(KERN_ERR "h3600ts.c: Could not allocate Power Button IRQ!\n");
                 err = -EBUSY;
                 goto fail3;
diff --git a/drivers/input/touchscreen/hp680_ts_input.c b/drivers/input/touchscreen/hp680_ts_input.c
index 957dd5a1b15e..fa97e0f79e7e 100644
--- a/drivers/input/touchscreen/hp680_ts_input.c
+++ b/drivers/input/touchscreen/hp680_ts_input.c
@@ -109,7 +109,7 @@ static int __init hp680_ts_init(void)
         input_register_device(hp680_ts_dev);
 
         if (request_irq(HP680_TS_IRQ, hp680_ts_interrupt,
-                        SA_INTERRUPT, MODNAME, 0) < 0) {
+                        IRQF_DISABLED, MODNAME, 0) < 0) {
                 printk(KERN_ERR "hp680_touchscreen.c: Can't allocate irq %d\n",
                        HP680_TS_IRQ);
                 input_unregister_device(hp680_ts_dev);