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

diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index bb4a8e0..e84d8fb 100644 (file)
--- a/arch/powerpc/platforms/cell/spu_base.c
+++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -402,7 +402,7 @@ static int spu_request_irqs(struct spu *spu)
 {
        int ret = 0;
 
-       if (spu->irqs[0] != NO_IRQ) {
+       if (spu->irqs[0]) {
                snprintf(spu->irq_c0, sizeof (spu->irq_c0), "spe%02d.0",
                         spu->number);
                ret = request_irq(spu->irqs[0], spu_irq_class_0,
@@ -410,7 +410,7 @@ static int spu_request_irqs(struct spu *spu)
                if (ret)
                        goto bail0;
        }
-       if (spu->irqs[1] != NO_IRQ) {
+       if (spu->irqs[1]) {
                snprintf(spu->irq_c1, sizeof (spu->irq_c1), "spe%02d.1",
                         spu->number);
                ret = request_irq(spu->irqs[1], spu_irq_class_1,
@@ -418,7 +418,7 @@ static int spu_request_irqs(struct spu *spu)
                if (ret)
                        goto bail1;
        }
-       if (spu->irqs[2] != NO_IRQ) {
+       if (spu->irqs[2]) {
                snprintf(spu->irq_c2, sizeof (spu->irq_c2), "spe%02d.2",
                         spu->number);
                ret = request_irq(spu->irqs[2], spu_irq_class_2,
@@ -429,10 +429,10 @@ static int spu_request_irqs(struct spu *spu)
        return 0;
 
 bail2:
-       if (spu->irqs[1] != NO_IRQ)
+       if (spu->irqs[1])
                free_irq(spu->irqs[1], spu);
 bail1:
-       if (spu->irqs[0] != NO_IRQ)
+       if (spu->irqs[0])
                free_irq(spu->irqs[0], spu);
 bail0:
        return ret;
@@ -440,11 +440,11 @@ bail0:
 
 static void spu_free_irqs(struct spu *spu)
 {
-       if (spu->irqs[0] != NO_IRQ)
+       if (spu->irqs[0])
                free_irq(spu->irqs[0], spu);
-       if (spu->irqs[1] != NO_IRQ)
+       if (spu->irqs[1])
                free_irq(spu->irqs[1], spu);
-       if (spu->irqs[2] != NO_IRQ)
+       if (spu->irqs[2])
                free_irq(spu->irqs[2], spu);
 }