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

[cascardo/linux.git] / arch / powerpc / platforms / cell / spu_manage.c

diff --git a/arch/powerpc/platforms/cell/spu_manage.c b/arch/powerpc/platforms/cell/spu_manage.c
index 21b4bfb..672d310 100644 (file)
--- a/arch/powerpc/platforms/cell/spu_manage.c
+++ b/arch/powerpc/platforms/cell/spu_manage.c
@@ -105,7 +105,10 @@ static int __init spu_map_interrupts_old(struct spu *spu,
        spu->irqs[2] = irq_create_mapping(NULL, IIC_IRQ_CLASS_2 | isrc);
 
        /* Right now, we only fail if class 2 failed */
-       return spu->irqs[2] == NO_IRQ ? -EINVAL : 0;
+       if (!spu->irqs[2])
+               return -EINVAL;
+
+       return 0;
 }
 
 static void __iomem * __init spu_map_prop_old(struct spu *spu,
@@ -191,7 +194,7 @@ static int __init spu_map_interrupts(struct spu *spu, struct device_node *np)
                pr_debug("  irq %d no 0x%x on %s\n", i, oirq.args[0],
                         oirq.np->full_name);
                spu->irqs[i] = irq_create_of_mapping(&oirq);
-               if (spu->irqs[i] == NO_IRQ) {
+               if (!spu->irqs[i]) {
                        pr_debug("spu_new: failed to map it !\n");
                        goto err;
                }
@@ -202,7 +205,7 @@ err:
        pr_debug("failed to map irq %x for spu %s\n", *oirq.args,
                spu->name);
        for (; i >= 0; i--) {
-               if (spu->irqs[i] != NO_IRQ)
+               if (spu->irqs[i])
                        irq_dispose_mapping(spu->irqs[i]);
        }
        return ret;