cris: remove deprecated IRQF_DISABLED

This patch proposes to remove the IRQF_DISABLED flag from CRIS
architecture code. It's a NOOP since 2.6.35 and it will be removed
one day.

Comments mentioning IRQF_DISABLED are also updated, knowing
that all interrupts are now "fast interrupts", their handlers
running with interrupts disabled.

Don't hesitate to let me know if you have other ways of
rephrasing the comments!

This is an update for 3.11 of a patch already sent for 3.10

Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com>
Signed-off-by: Jesper Nilsson <jespern@axis.com>

3 files changed, 6 insertions, 8 deletions

diff --git a/arch/cris/arch-v10/drivers/gpio.c b/arch/cris/arch-v10/drivers/gpio.c
index 609d5510410e..f4374bae4fb4 100644
--- a/arch/cris/arch-v10/drivers/gpio.c
+++ b/arch/cris/arch-v10/drivers/gpio.c
@@ -838,13 +838,13 @@ static int __init gpio_init(void)
          * in some tests.
          */
         res = request_irq(TIMER0_IRQ_NBR, gpio_poll_timer_interrupt,
-                IRQF_SHARED | IRQF_DISABLED, "gpio poll", gpio_name);
+                IRQF_SHARED, "gpio poll", gpio_name);
         if (res) {
                 printk(KERN_CRIT "err: timer0 irq for gpio\n");
                 return res;
         }
         res = request_irq(PA_IRQ_NBR, gpio_interrupt,
-                IRQF_SHARED | IRQF_DISABLED, "gpio PA", gpio_name);
+                IRQF_SHARED, "gpio PA", gpio_name);
         if (res)
                 printk(KERN_CRIT "err: PA irq for gpio\n");
 
diff --git a/arch/cris/arch-v10/drivers/sync_serial.c b/arch/cris/arch-v10/drivers/sync_serial.c
index a1c498d18d31..04d39e0ca55d 100644
--- a/arch/cris/arch-v10/drivers/sync_serial.c
+++ b/arch/cris/arch-v10/drivers/sync_serial.c
@@ -580,7 +580,7 @@ static int sync_serial_open(struct inode *inode, struct file *file)
                         if (port == &ports[0]) {
                                 if (request_irq(8,
                                                 manual_interrupt,
-                                                IRQF_SHARED | IRQF_DISABLED,
+                                                IRQF_SHARED,
                                                 "synchronous serial manual irq",
                                                 &ports[0])) {
                                         printk(KERN_CRIT "Can't alloc "
@@ -590,7 +590,7 @@ static int sync_serial_open(struct inode *inode, struct file *file)
                         } else if (port == &ports[1]) {
                                 if (request_irq(8,
                                                 manual_interrupt,
-                                                IRQF_SHARED | IRQF_DISABLED,
+                                                IRQF_SHARED,
                                                 "synchronous serial manual irq",
                                                 &ports[1])) {
                                         printk(KERN_CRIT "Can't alloc "
diff --git a/arch/cris/arch-v10/kernel/time.c b/arch/cris/arch-v10/kernel/time.c
index fce7c541d70d..e6a722715a8d 100644
--- a/arch/cris/arch-v10/kernel/time.c
+++ b/arch/cris/arch-v10/kernel/time.c
@@ -178,13 +178,11 @@ timer_interrupt(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-/* timer is IRQF_SHARED so drivers can add stuff to the timer irq chain
- * it needs to be IRQF_DISABLED to make the jiffies update work properly
- */
+/* timer is IRQF_SHARED so drivers can add stuff to the timer irq chain */
 
 static struct irqaction irq2  = {
         .handler = timer_interrupt,
-        .flags = IRQF_SHARED | IRQF_DISABLED,
+        .flags = IRQF_SHARED,
         .name = "timer",
 };