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

[cascardo/linux.git] / arch / powerpc / kernel / legacy_serial.c

diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c
index 7b750c4..bc525ea 100644 (file)
--- a/arch/powerpc/kernel/legacy_serial.c
+++ b/arch/powerpc/kernel/legacy_serial.c
@@ -193,10 +193,10 @@ static int __init add_legacy_soc_port(struct device_node *np,
         */
        if (tsi && !strcmp(tsi->type, "tsi-bridge"))
                return add_legacy_port(np, -1, UPIO_TSI, addr, addr,
-                                      NO_IRQ, legacy_port_flags, 0);
+                                      0, legacy_port_flags, 0);
        else
                return add_legacy_port(np, -1, UPIO_MEM, addr, addr,
-                                      NO_IRQ, legacy_port_flags, 0);
+                                      0, legacy_port_flags, 0);
 }
 
 static int __init add_legacy_isa_port(struct device_node *np,
@@ -242,7 +242,7 @@ static int __init add_legacy_isa_port(struct device_node *np,
 
        /* Add port, irq will be dealt with later */
        return add_legacy_port(np, index, UPIO_PORT, be32_to_cpu(reg[1]),
-                              taddr, NO_IRQ, legacy_port_flags, 0);
+                              taddr, 0, legacy_port_flags, 0);
 
 }
 
@@ -314,7 +314,7 @@ static int __init add_legacy_pci_port(struct device_node *np,
        /* Add port, irq will be dealt with later. We passed a translated
         * IO port value. It will be fixed up later along with the irq
         */
-       return add_legacy_port(np, index, iotype, base, addr, NO_IRQ,
+       return add_legacy_port(np, index, iotype, base, addr, 0,
                               legacy_port_flags, np != pci_dev);
 }
 #endif
@@ -462,14 +462,14 @@ static void __init fixup_port_irq(int index,
        DBG("fixup_port_irq(%d)\n", index);
 
        virq = irq_of_parse_and_map(np, 0);
-       if (virq == NO_IRQ && legacy_serial_infos[index].irq_check_parent) {
+       if (!virq && legacy_serial_infos[index].irq_check_parent) {
                np = of_get_parent(np);
                if (np == NULL)
                        return;
                virq = irq_of_parse_and_map(np, 0);
                of_node_put(np);
        }
-       if (virq == NO_IRQ)
+       if (!virq)
                return;
 
        port->irq = virq;
@@ -543,7 +543,7 @@ static int __init serial_dev_init(void)
                struct plat_serial8250_port *port = &legacy_serial_ports[i];
                struct device_node *np = legacy_serial_infos[i].np;
 
-               if (port->irq == NO_IRQ)
+               if (!port->irq)
                        fixup_port_irq(i, np, port);
                if (port->iotype == UPIO_PORT)
                        fixup_port_pio(i, np, port);