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-hv.c

diff --git a/arch/powerpc/sysdev/xics/icp-hv.c b/arch/powerpc/sysdev/xics/icp-hv.c
index c1917cf..e7fa26c 100644 (file)
--- a/arch/powerpc/sysdev/xics/icp-hv.c
+++ b/arch/powerpc/sysdev/xics/icp-hv.c
@@ -112,10 +112,10 @@ static unsigned int icp_hv_get_irq(void)
        unsigned int irq;
 
        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;
        }
@@ -126,7 +126,7 @@ static unsigned int icp_hv_get_irq(void)
        /* We might learn about it later, so EOI it */
        icp_hv_set_xirr(xirr);
 
-       return NO_IRQ;
+       return 0;
 }
 
 static void icp_hv_set_cpu_priority(unsigned char cppr)