ARM: davinci: remove deprecated IRQF_DISABLED

This patch proposes to remove the IRQF_DISABLED flag from Davinci code ;)
It's a NOOP since 2.6.35, and will be removed one day

Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Olof Johansson <olof@lixom.net>

3 files changed, 4 insertions, 4 deletions

diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c
index c4bdc0a1c36e..30a44e2df47e 100644
--- a/arch/arm/mach-davinci/board-da830-evm.c
+++ b/arch/arm/mach-davinci/board-da830-evm.c
@@ -74,7 +74,7 @@ static int da830_evm_usb_ocic_notify(da8xx_ocic_handler_t handler)
         if (handler != NULL) {
                 da830_evm_usb_ocic_handler = handler;
 
-                error = request_irq(irq, da830_evm_usb_ocic_irq, IRQF_DISABLED |
+                error = request_irq(irq, da830_evm_usb_ocic_irq,
                                     IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
                                     "OHCI over-current indicator", NULL);
                 if (error)
diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c
index ab98c75cabb4..e0de2da41b5c 100644
--- a/arch/arm/mach-davinci/board-omapl138-hawk.c
+++ b/arch/arm/mach-davinci/board-omapl138-hawk.c
@@ -211,7 +211,7 @@ static int hawk_usb_ocic_notify(da8xx_ocic_handler_t handler)
                 hawk_usb_ocic_handler = handler;
 
                 error = request_irq(irq, omapl138_hawk_usb_ocic_irq,
-                                        IRQF_DISABLED | IRQF_TRIGGER_RISING |
+                                        IRQF_TRIGGER_RISING |
                                         IRQF_TRIGGER_FALLING,
                                         "OHCI over-current indicator", NULL);
                 if (error)
diff --git a/arch/arm/mach-davinci/time.c b/arch/arm/mach-davinci/time.c
index 7a55b5c95971..e7ada0ca72ee 100644
--- a/arch/arm/mach-davinci/time.c
+++ b/arch/arm/mach-davinci/time.c
@@ -181,7 +181,7 @@ static struct timer_s timers[] = {
                 .name      = "clockevent",
                 .opts      = TIMER_OPTS_DISABLED,
                 .irqaction = {
-                        .flags   = IRQF_DISABLED | IRQF_TIMER,
+                        .flags   = IRQF_TIMER,
                         .handler = timer_interrupt,
                 }
         },
@@ -190,7 +190,7 @@ static struct timer_s timers[] = {
                 .period     = ~0,
                 .opts       = TIMER_OPTS_PERIODIC,
                 .irqaction = {
-                        .flags   = IRQF_DISABLED | IRQF_TIMER,
+                        .flags   = IRQF_TIMER,
                         .handler = freerun_interrupt,
                 }
         },