From 5fda7a0e715c32c6dd9a39ebce8429eeafb64b7d Mon Sep 17 00:00:00 2001 From: Peter Hurley <peter@hurleysoftware.com> Date: Mon, 16 Jun 2014 09:17:05 -0400 Subject: [PATCH] serial: Use UPF_* constants with struct uart_port flags 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 | 2 +- drivers/tty/serial/mcf.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/tty/serial/lantiq.c b/drivers/tty/serial/lantiq.c index ea030830cfa29..4675fe198d31a 100644 --- a/drivers/tty/serial/lantiq.c +++ b/drivers/tty/serial/lantiq.c @@ -703,7 +703,7 @@ lqasc_probe(struct platform_device *pdev) port = <q_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, diff --git a/drivers/tty/serial/mcf.c b/drivers/tty/serial/mcf.c index fab4d6ad16ef7..bc896dc7d2ed4 100644 --- a/drivers/tty/serial/mcf.c +++ b/drivers/tty/serial/mcf.c @@ -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); }