[PATCH] irq-flags: SPARC: 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>

8 files changed, 19 insertions, 21 deletions

diff --git a/arch/sparc/kernel/irq.c b/arch/sparc/kernel/irq.c
index b81af076ef48..cde73327ca96 100644
--- a/arch/sparc/kernel/irq.c
+++ b/arch/sparc/kernel/irq.c
@@ -191,11 +191,11 @@ int show_interrupts(struct seq_file *p, void *v)
                 }
 #endif
                 seq_printf(p, " %c %s",
-                        (action->flags & SA_INTERRUPT) ? '+' : ' ',
+                        (action->flags & IRQF_DISABLED) ? '+' : ' ',
                         action->name);
                 for (action=action->next; action; action = action->next) {
                         seq_printf(p, ",%s %s",
-                                (action->flags & SA_INTERRUPT) ? " +" : "",
+                                (action->flags & IRQF_DISABLED) ? " +" : "",
                                 action->name);
                 }
                 seq_putc(p, '\n');
@@ -243,7 +243,7 @@ void free_irq(unsigned int irq, void *dev_id)
                         printk("Trying to free free shared IRQ%d\n",irq);
                         goto out_unlock;
                 }
-        } else if (action->flags & SA_SHIRQ) {
+        } else if (action->flags & IRQF_SHARED) {
                 printk("Trying to free shared IRQ%d with NULL device ID\n", irq);
                 goto out_unlock;
         }
@@ -395,9 +395,9 @@ int request_fast_irq(unsigned int irq,
 
         action = sparc_irq[cpu_irq].action;
         if(action) {
-                if(action->flags & SA_SHIRQ)
+                if(action->flags & IRQF_SHARED)
                         panic("Trying to register fast irq when already shared.\n");
-                if(irqflags & SA_SHIRQ)
+                if(irqflags & IRQF_SHARED)
                         panic("Trying to register fast irq as shared.\n");
 
                 /* Anyway, someone already owns it so cannot be made fast. */
@@ -497,11 +497,11 @@ int request_irq(unsigned int irq,
         actionp = &sparc_irq[cpu_irq].action;
         action = *actionp;
         if (action) {
-                if (!(action->flags & SA_SHIRQ) || !(irqflags & SA_SHIRQ)) {
+                if (!(action->flags & IRQF_SHARED) || !(irqflags & IRQF_SHARED)) {
                         ret = -EBUSY;
                         goto out_unlock;
                 }
-                if ((action->flags & SA_INTERRUPT) != (irqflags & SA_INTERRUPT)) {
+                if ((action->flags & IRQF_DISABLED) != (irqflags & IRQF_DISABLED)) {
                         printk("Attempt to mix fast and slow interrupts on IRQ%d denied\n", irq);
                         ret = -EBUSY;
                         goto out_unlock;
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c
index 22422ff10602..bfd31aac2df3 100644
--- a/arch/sparc/kernel/pcic.c
+++ b/arch/sparc/kernel/pcic.c
@@ -745,7 +745,7 @@ void __init pci_time_init(void)
         writel (PCI_COUNTER_IRQ_SET(timer_irq, 0),
                 pcic->pcic_regs+PCI_COUNTER_IRQ);
         irq = request_irq(timer_irq, pcic_timer_handler,
-                          (SA_INTERRUPT | SA_STATIC_ALLOC), "timer", NULL);
+                          (IRQF_DISABLED | SA_STATIC_ALLOC), "timer", NULL);
         if (irq) {
                 prom_printf("time_init: unable to attach IRQ%d\n", timer_irq);
                 prom_halt();
diff --git a/arch/sparc/kernel/sun4c_irq.c b/arch/sparc/kernel/sun4c_irq.c
index 50e988b9c8c3..4be2c86ea540 100644
--- a/arch/sparc/kernel/sun4c_irq.c
+++ b/arch/sparc/kernel/sun4c_irq.c
@@ -179,7 +179,7 @@ static void __init sun4c_init_timers(irqreturn_t (*counter_fn)(int, void *, stru
 
         irq = request_irq(TIMER_IRQ,
                           counter_fn,
-                          (SA_INTERRUPT | SA_STATIC_ALLOC),
+                          (IRQF_DISABLED | SA_STATIC_ALLOC),
                           "timer", NULL);
         if (irq) {
                 prom_printf("time_init: unable to attach IRQ%d\n",TIMER_IRQ);
diff --git a/arch/sparc/kernel/sun4d_irq.c b/arch/sparc/kernel/sun4d_irq.c
index cbf8ee81cf5b..74eed9775ac0 100644
--- a/arch/sparc/kernel/sun4d_irq.c
+++ b/arch/sparc/kernel/sun4d_irq.c
@@ -107,13 +107,13 @@ found_it:	seq_printf(p, "%3d: ", i);
                                kstat_cpu(cpu_logical_map(x)).irqs[i]);
 #endif
                 seq_printf(p, "%c %s",
-                        (action->flags & SA_INTERRUPT) ? '+' : ' ',
+                        (action->flags & IRQF_DISABLED) ? '+' : ' ',
                         action->name);
                 action = action->next;
                 for (;;) {
                         for (; action; action = action->next) {
                                 seq_printf(p, ",%s %s",
-                                        (action->flags & SA_INTERRUPT) ? " +" : "",
+                                        (action->flags & IRQF_DISABLED) ? " +" : "",
                                         action->name);
                         }
                         if (!sbusl) break;
@@ -160,7 +160,7 @@ void sun4d_free_irq(unsigned int irq, void *dev_id)
                         printk("Trying to free free shared IRQ%d\n",irq);
                         goto out_unlock;
                 }
-        } else if (action->flags & SA_SHIRQ) {
+        } else if (action->flags & IRQF_SHARED) {
                 printk("Trying to free shared IRQ%d with NULL device ID\n", irq);
                 goto out_unlock;
         }
@@ -298,13 +298,13 @@ int sun4d_request_irq(unsigned int irq,
         action = *actionp;
         
         if (action) {
-                if ((action->flags & SA_SHIRQ) && (irqflags & SA_SHIRQ)) {
+                if ((action->flags & IRQF_SHARED) && (irqflags & IRQF_SHARED)) {
                         for (tmp = action; tmp->next; tmp = tmp->next);
                 } else {
                         ret = -EBUSY;
                         goto out_unlock;
                 }
-                if ((action->flags & SA_INTERRUPT) ^ (irqflags & SA_INTERRUPT)) {
+                if ((action->flags & IRQF_DISABLED) ^ (irqflags & IRQF_DISABLED)) {
                         printk("Attempt to mix fast and slow interrupts on IRQ%d denied\n", irq);
                         ret = -EBUSY;
                         goto out_unlock;
@@ -490,7 +490,7 @@ static void __init sun4d_init_timers(irqreturn_t (*counter_fn)(int, void *, stru
 
         irq = request_irq(TIMER_IRQ,
                           counter_fn,
-                          (SA_INTERRUPT | SA_STATIC_ALLOC),
+                          (IRQF_DISABLED | SA_STATIC_ALLOC),
                           "timer", NULL);
         if (irq) {
                 prom_printf("time_init: unable to attach IRQ%d\n",TIMER_IRQ);
diff --git a/arch/sparc/kernel/sun4m_irq.c b/arch/sparc/kernel/sun4m_irq.c
index 38ac672b1149..7cefa301efea 100644
--- a/arch/sparc/kernel/sun4m_irq.c
+++ b/arch/sparc/kernel/sun4m_irq.c
@@ -278,7 +278,7 @@ static void __init sun4m_init_timers(irqreturn_t (*counter_fn)(int, void *, stru
 
         irq = request_irq(TIMER_IRQ,
                           counter_fn,
-                          (SA_INTERRUPT | SA_STATIC_ALLOC),
+                          (IRQF_DISABLED | SA_STATIC_ALLOC),
                           "timer", NULL);
         if (irq) {
                 prom_printf("time_init: unable to attach IRQ%d\n",TIMER_IRQ);
diff --git a/arch/sparc/kernel/tick14.c b/arch/sparc/kernel/tick14.c
index 591547af4c65..d3b4daac705f 100644
--- a/arch/sparc/kernel/tick14.c
+++ b/arch/sparc/kernel/tick14.c
@@ -74,7 +74,7 @@ void claim_ticker14(irqreturn_t (*handler)(int, void *, struct pt_regs *),
 
         if (!request_irq(irq_nr,
                          handler,
-                         (SA_INTERRUPT | SA_STATIC_ALLOC),
+                         (IRQF_DISABLED | SA_STATIC_ALLOC),
                          "counter14",
                          NULL)) {
                 install_linux_ticker();
diff --git a/include/asm-sparc/floppy.h b/include/asm-sparc/floppy.h
index 7a941b800b6b..c53b332c850a 100644
--- a/include/asm-sparc/floppy.h
+++ b/include/asm-sparc/floppy.h
@@ -271,7 +271,8 @@ static int sun_fd_request_irq(void)
 
         if(!once) {
                 once = 1;
-                error = request_fast_irq(FLOPPY_IRQ, floppy_hardint, SA_INTERRUPT, "floppy");
+                error = request_fast_irq(FLOPPY_IRQ, floppy_hardint,
+                                         IRQF_DISABLED, "floppy");
                 return ((error == 0) ? 0 : -1);
         } else return 0;
 }
diff --git a/include/asm-sparc/signal.h b/include/asm-sparc/signal.h
index aa9960ad0ca9..0ae5084c427b 100644
--- a/include/asm-sparc/signal.h
+++ b/include/asm-sparc/signal.h
@@ -132,16 +132,13 @@ struct sigstack {
  * usage of signal stacks by using the (now obsolete) sa_restorer field in
  * the sigaction structure as a stack pointer. This is now possible due to
  * the changes in signal handling. LBT 010493.
- * SA_INTERRUPT is a no-op, but left due to historical reasons. Use the
  * SA_RESTART flag to get restarting signals (which were the default long ago)
- * SA_SHIRQ flag is for shared interrupt support on PCI and EISA.
  */
 #define SA_NOCLDSTOP    _SV_IGNCHILD
 #define SA_STACK        _SV_SSTACK
 #define SA_ONSTACK      _SV_SSTACK
 #define SA_RESTART      _SV_INTR
 #define SA_ONESHOT      _SV_RESET
-#define SA_INTERRUPT    0x10u
 #define SA_NOMASK       0x20u
 #define SA_NOCLDWAIT    0x100u
 #define SA_SIGINFO      0x200u