[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>

2 files changed, 7 insertions, 7 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");