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

Use the new IRQF_ constants and remove the SA_INTERRUPT define

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>

1 files changed, 8 insertions, 8 deletions

diff --git a/arch/arm26/kernel/irq.c b/arch/arm26/kernel/irq.c
index e08ba2955ec7..d87d68b77d66 100644
--- a/arch/arm26/kernel/irq.c
+++ b/arch/arm26/kernel/irq.c
@@ -190,7 +190,7 @@ __do_irq(unsigned int irq, struct irqaction *action, struct pt_regs *regs)
         int ret;
 
         spin_unlock(&irq_controller_lock);
-        if (!(action->flags & SA_INTERRUPT))
+        if (!(action->flags & IRQF_DISABLED))
                 local_irq_enable();
 
         status = 0;
@@ -201,7 +201,7 @@ __do_irq(unsigned int irq, struct irqaction *action, struct pt_regs *regs)
                 action = action->next;
         } while (action);
 
-        if (status & SA_SAMPLE_RANDOM)
+        if (status & IRQF_SAMPLE_RANDOM)
                 add_interrupt_randomness(irq);
 
         spin_lock_irq(&irq_controller_lock);
@@ -451,7 +451,7 @@ int setup_irq(unsigned int irq, struct irqaction *new)
          * so we have to be careful not to interfere with a
          * running system.
          */
-        if (new->flags & SA_SAMPLE_RANDOM) {
+        if (new->flags & IRQF_SAMPLE_RANDOM) {
                 /*
                  * This function might sleep, we want to call it first,
                  * outside of the atomic block.
@@ -471,7 +471,7 @@ int setup_irq(unsigned int irq, struct irqaction *new)
         p = &desc->action;
         if ((old = *p) != NULL) {
                 /* Can't share interrupts unless both agree to */
-                if (!(old->flags & new->flags & SA_SHIRQ)) {
+                if (!(old->flags & new->flags & IRQF_SHARED)) {
                         spin_unlock_irqrestore(&irq_controller_lock, flags);
                         return -EBUSY;
                 }
@@ -526,11 +526,11 @@ int setup_irq(unsigned int irq, struct irqaction *new)
  *
  *      Flags:
  *
- *      SA_SHIRQ                Interrupt is shared
+ *      IRQF_SHARED             Interrupt is shared
  *
- *      SA_INTERRUPT            Disable local interrupts while processing
+ *      IRQF_DISABLED   Disable local interrupts while processing
  *
- *      SA_SAMPLE_RANDOM        The interrupt can be used for entropy
+ *      IRQF_SAMPLE_RANDOM      The interrupt can be used for entropy
  *
  */
 
@@ -542,7 +542,7 @@ int request_irq(unsigned int irq, irqreturn_t (*handler)(int, void *, struct pt_
         struct irqaction *action;
 
         if (irq >= NR_IRQS || !irq_desc[irq].valid || !handler ||
-            (irq_flags & SA_SHIRQ && !dev_id))
+            (irq_flags & IRQF_SHARED && !dev_id))
                 return -EINVAL;
 
         action = (struct irqaction *)kmalloc(sizeof(struct irqaction), GFP_KERNEL);