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

[cascardo/linux.git] / arch / powerpc / platforms / embedded6xx / hlwd-pic.c

diff --git a/arch/powerpc/platforms/embedded6xx/hlwd-pic.c b/arch/powerpc/platforms/embedded6xx/hlwd-pic.c
index 9b79757..89c54de 100644 (file)
--- a/arch/powerpc/platforms/embedded6xx/hlwd-pic.c
+++ b/arch/powerpc/platforms/embedded6xx/hlwd-pic.c
@@ -114,7 +114,7 @@ static unsigned int __hlwd_pic_get_irq(struct irq_domain *h)
        irq_status = in_be32(io_base + HW_BROADWAY_ICR) &
                     in_be32(io_base + HW_BROADWAY_IMR);
        if (irq_status == 0)
-               return NO_IRQ;  /* no more IRQs pending */
+               return 0;       /* no more IRQs pending */
 
        irq = __ffs(irq_status);
        return irq_linear_revmap(h, irq);
@@ -131,7 +131,7 @@ static void hlwd_pic_irq_cascade(struct irq_desc *desc)
        raw_spin_unlock(&desc->lock);
 
        virq = __hlwd_pic_get_irq(irq_domain);
-       if (virq != NO_IRQ)
+       if (virq)
                generic_handle_irq(virq);
        else
                pr_err("spurious interrupt!\n");