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

[cascardo/linux.git] / arch / powerpc / sysdev / cpm1.c

diff --git a/arch/powerpc/sysdev/cpm1.c b/arch/powerpc/sysdev/cpm1.c
index 81d4947..3c0eb9b 100644 (file)
--- a/arch/powerpc/sysdev/cpm1.c
+++ b/arch/powerpc/sysdev/cpm1.c
@@ -132,7 +132,7 @@ unsigned int cpm_pic_init(void)
 {
        struct device_node *np = NULL;
        struct resource res;
-       unsigned int sirq = NO_IRQ, hwirq, eirq;
+       unsigned int sirq = 0, hwirq, eirq;
        int ret;
 
        pr_debug("cpm_pic_init\n");
@@ -154,7 +154,7 @@ unsigned int cpm_pic_init(void)
                goto end;
 
        sirq = irq_of_parse_and_map(np, 0);
-       if (sirq == NO_IRQ)
+       if (!sirq)
                goto end;
 
        /* Initialize the CPM interrupt controller. */
@@ -168,7 +168,7 @@ unsigned int cpm_pic_init(void)
        cpm_pic_host = irq_domain_add_linear(np, 64, &cpm_pic_host_ops, NULL);
        if (cpm_pic_host == NULL) {
                printk(KERN_ERR "CPM2 PIC: failed to allocate irq host!\n");
-               sirq = NO_IRQ;
+               sirq = 0;
                goto end;
        }
 
@@ -182,7 +182,7 @@ unsigned int cpm_pic_init(void)
        }
 
        eirq = irq_of_parse_and_map(np, 0);
-       if (eirq == NO_IRQ)
+       if (!eirq)
                goto end;
 
        if (setup_irq(eirq, &cpm_error_irqaction))