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

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

diff --git a/arch/powerpc/sysdev/axonram.c b/arch/powerpc/sysdev/axonram.c
index 9144204..ada29ea 100644 (file)
--- a/arch/powerpc/sysdev/axonram.c
+++ b/arch/powerpc/sysdev/axonram.c
@@ -240,7 +240,7 @@ static int axon_ram_probe(struct platform_device *device)
        device_add_disk(&device->dev, bank->disk);
 
        bank->irq_id = irq_of_parse_and_map(device->dev.of_node, 0);
-       if (bank->irq_id == NO_IRQ) {
+       if (!bank->irq_id) {
                dev_err(&device->dev, "Cannot access ECC interrupt ID\n");
                rc = -EFAULT;
                goto failed;
@@ -250,7 +250,7 @@ static int axon_ram_probe(struct platform_device *device)
                        AXON_RAM_IRQ_FLAGS, bank->disk->disk_name, device);
        if (rc != 0) {
                dev_err(&device->dev, "Cannot register ECC interrupt handler\n");
-               bank->irq_id = NO_IRQ;
+               bank->irq_id = 0;
                rc = -EFAULT;
                goto failed;
        }
@@ -268,7 +268,7 @@ static int axon_ram_probe(struct platform_device *device)
 
 failed:
        if (bank != NULL) {
-               if (bank->irq_id != NO_IRQ)
+               if (bank->irq_id)
                        free_irq(bank->irq_id, device);
                if (bank->disk != NULL) {
                        if (bank->disk->major > 0)