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

[cascardo/linux.git] / arch / powerpc / sysdev / xics / icp-opal.c

diff --git a/arch/powerpc/sysdev/xics/icp-opal.c b/arch/powerpc/sysdev/xics/icp-opal.c
index 9114243..d38e86f 100644 (file)
--- a/arch/powerpc/sysdev/xics/icp-opal.c
+++ b/arch/powerpc/sysdev/xics/icp-opal.c
@@ -51,14 +51,14 @@ static unsigned int icp_opal_get_irq(void)
 
        rc = opal_int_get_xirr(&xirr, false);
        if (rc < 0)
-               return NO_IRQ;
+               return 0;
        xirr = be32_to_cpu(xirr);
        vec = xirr & 0x00ffffff;
        if (vec == XICS_IRQ_SPURIOUS)
-               return NO_IRQ;
+               return 0;
 
        irq = irq_find_mapping(xics_host, vec);
-       if (likely(irq != NO_IRQ)) {
+       if (likely(irq)) {
                xics_push_cppr(vec);
                return irq;
        }
@@ -69,7 +69,7 @@ static unsigned int icp_opal_get_irq(void)
        /* We might learn about it later, so EOI it */
        opal_int_eoi(xirr);
 
-       return NO_IRQ;
+       return 0;
 }
 
 static void icp_opal_set_cpu_priority(unsigned char cppr)