OSDN Git Service

serial: Use UPF_* constants with struct uart_port flags
authorPeter Hurley <peter@hurleysoftware.com>
Mon, 16 Jun 2014 13:17:05 +0000 (09:17 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 10 Jul 2014 23:06:49 +0000 (16:06 -0700)
Fix ASYNC_* constant usage that should be the corresponding UPF_*
constant.

CC: Grant Likely <grant.likely@linaro.org>
CC: Rob Herring <robh+dt@kernel.org>
CC: devicetree@vger.kernel.org
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/lantiq.c
drivers/tty/serial/mcf.c

index ea03083..4675fe1 100644 (file)
@@ -703,7 +703,7 @@ lqasc_probe(struct platform_device *pdev)
        port = &ltq_port->port;
 
        port->iotype    = SERIAL_IO_MEM;
-       port->flags     = ASYNC_BOOT_AUTOCONF | UPF_IOREMAP;
+       port->flags     = UPF_BOOT_AUTOCONF | UPF_IOREMAP;
        port->ops       = &lqasc_pops;
        port->fifosize  = 16;
        port->type      = PORT_LTQ_ASC,
index fab4d6a..bc896dc 100644 (file)
@@ -537,7 +537,7 @@ int __init early_mcf_setup(struct mcf_platform_uart *platp)
                port->iotype = SERIAL_IO_MEM;
                port->irq = platp[i].irq;
                port->uartclk = MCF_BUSCLK;
-               port->flags = ASYNC_BOOT_AUTOCONF;
+               port->flags = UPF_BOOT_AUTOCONF;
                port->ops = &mcf_uart_ops;
        }
 
@@ -662,7 +662,7 @@ static int mcf_probe(struct platform_device *pdev)
                port->irq = platp[i].irq;
                port->uartclk = MCF_BUSCLK;
                port->ops = &mcf_uart_ops;
-               port->flags = ASYNC_BOOT_AUTOCONF;
+               port->flags = UPF_BOOT_AUTOCONF;
 
                uart_add_one_port(&mcf_driver, port);
        }