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

[cascardo/linux.git] / arch / powerpc / platforms / powernv / opal-irqchip.c

diff --git a/arch/powerpc/platforms/powernv/opal-irqchip.c b/arch/powerpc/platforms/powernv/opal-irqchip.c
index ed8bba6..998316b 100644 (file)
--- a/arch/powerpc/platforms/powernv/opal-irqchip.c
+++ b/arch/powerpc/platforms/powernv/opal-irqchip.c
@@ -222,7 +222,7 @@ int __init opal_event_init(void)
                /* Get hardware and virtual IRQ */
                irq = be32_to_cpup(irqs);
                virq = irq_create_mapping(NULL, irq);
-               if (virq == NO_IRQ) {
+               if (!virq) {
                        pr_warn("Failed to map irq 0x%x\n", irq);
                        continue;
                }
@@ -260,7 +260,7 @@ machine_arch_initcall(powernv, opal_event_init);
 int opal_event_request(unsigned int opal_event_nr)
 {
        if (WARN_ON_ONCE(!opal_event_irqchip.domain))
-               return NO_IRQ;
+               return 0;
 
        return irq_create_mapping(opal_event_irqchip.domain, opal_event_nr);
 }