powerpc: Remove NO_IRQ_IGNORE

Now that legacy iSeries is gone, this is no longer used.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

diff --git a/arch/powerpc/include/asm/irq.h b/arch/powerpc/include/asm/irq.h
index fe0b09dceb7d1ff97c0d6ef9c591c4189446c076..cf417e51073627ff6184f15ddd3a78f7948419c7 100644 (file)
--- a/arch/powerpc/include/asm/irq.h
+++ b/arch/powerpc/include/asm/irq.h
@@ -27,12 +27,6 @@ extern atomic_t ppc_n_lost_interrupts;
 /* This number is used when no interrupt has been assigned */
 #define NO_IRQ                 (0)
 
 /* This number is used when no interrupt has been assigned */
 #define NO_IRQ                 (0)
 

-/* This is a special irq number to return from get_irq() to tell that
- * no interrupt happened _and_ ignore it (don't count it as bad). Some
- * platforms like iSeries rely on that.
- */
-#define NO_IRQ_IGNORE          ((unsigned int)-1)
-

 /* Total number of virq in the platform */
 #define NR_IRQS                CONFIG_NR_IRQS
 
 /* Total number of virq in the platform */
 #define NR_IRQS                CONFIG_NR_IRQS
 

diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h
index bf37931d1ad6d7254f4a2e10149a040b3a059e36..42ce570812c1629afb75ed7a5a472d059570305c 100644 (file)
--- a/arch/powerpc/include/asm/machdep.h
+++ b/arch/powerpc/include/asm/machdep.h
@@ -99,9 +99,7 @@ struct machdep_calls {
 
        void            (*init_IRQ)(void);
 
 
        void            (*init_IRQ)(void);
 

-       /* Return an irq, or NO_IRQ to indicate there are none pending.
-        * If for some reason there is no irq, but the interrupt
-        * shouldn't be counted as spurious, return NO_IRQ_IGNORE. */
+       /* Return an irq, or NO_IRQ to indicate there are none pending. */

        unsigned int    (*get_irq)(void);
 
        /* PCI stuff */
        unsigned int    (*get_irq)(void);
 
        /* PCI stuff */

diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index a3d128e94cff4b9753810ebd6e09d9410cd9760a..46ce5f7335114b1a92fbf4905b15f43bb2f5dee0 100644 (file)
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -445,9 +445,9 @@ void do_IRQ(struct pt_regs *regs)
        may_hard_irq_enable();
 
        /* And finally process it */
        may_hard_irq_enable();
 
        /* And finally process it */

-       if (irq != NO_IRQ && irq != NO_IRQ_IGNORE)
+       if (irq != NO_IRQ)

                handle_one_irq(irq);
                handle_one_irq(irq);

-       else if (irq != NO_IRQ_IGNORE)
+       else

                __get_cpu_var(irq_stat).spurious_irqs++;
 
        irq_exit();
                __get_cpu_var(irq_stat).spurious_irqs++;
 
        irq_exit();