Merge tag 'powerpc-4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[cascardo/linux.git] / arch / powerpc / platforms / 85xx / socrates_fpga_pic.c

diff --git a/arch/powerpc/platforms/85xx/socrates_fpga_pic.c b/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
index b02d6a5..82f8490 100644 (file)
--- a/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
+++ b/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
@@ -78,7 +78,7 @@ static inline unsigned int socrates_fpga_pic_get_irq(unsigned int irq)
                        break;
        }
        if (i == 3)
-               return NO_IRQ;
+               return 0;
 
        raw_spin_lock_irqsave(&socrates_fpga_pic_lock, flags);
        cause = socrates_fpga_pic_read(FPGA_PIC_IRQMASK(i));
@@ -103,7 +103,7 @@ static void socrates_fpga_pic_cascade(struct irq_desc *desc)
         */
        cascade_irq = socrates_fpga_pic_get_irq(irq);
 
-       if (cascade_irq != NO_IRQ)
+       if (cascade_irq)
                generic_handle_irq(cascade_irq);
        chip->irq_eoi(&desc->irq_data);
 }
@@ -292,7 +292,7 @@ void socrates_fpga_pic_init(struct device_node *pic)
 
        for (i = 0; i < 3; i++) {
                socrates_fpga_irqs[i] = irq_of_parse_and_map(pic, i);
-               if (socrates_fpga_irqs[i] == NO_IRQ) {
+               if (!socrates_fpga_irqs[i]) {
                        pr_warning("FPGA PIC: can't get irq%d.\n", i);
                        continue;
                }