提交 1b1ecaa6 编写于 作者: H Heiner Kallweit 提交者: Greg Kroah-Hartman

serial: meson: remove use of flag UPF_IOREMAP

Flag UPF_IOREMAP is used by the 8250 subsystem only, it's not used
by the serial core. Therefore I don't see any benefit in using it
here.

In addition fix the order of calls in meson_uart_release_port.
Unmapping needs to be done first, reversing call order in
meson_uart_request_port.
Signed-off-by: NHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 ff3b9cad
...@@ -404,12 +404,9 @@ static int meson_uart_verify_port(struct uart_port *port, ...@@ -404,12 +404,9 @@ static int meson_uart_verify_port(struct uart_port *port,
static void meson_uart_release_port(struct uart_port *port) static void meson_uart_release_port(struct uart_port *port)
{ {
if (port->flags & UPF_IOREMAP) { devm_iounmap(port->dev, port->membase);
devm_release_mem_region(port->dev, port->mapbase, port->membase = NULL;
port->mapsize); devm_release_mem_region(port->dev, port->mapbase, port->mapsize);
devm_iounmap(port->dev, port->membase);
port->membase = NULL;
}
} }
static int meson_uart_request_port(struct uart_port *port) static int meson_uart_request_port(struct uart_port *port)
...@@ -420,13 +417,10 @@ static int meson_uart_request_port(struct uart_port *port) ...@@ -420,13 +417,10 @@ static int meson_uart_request_port(struct uart_port *port)
return -EBUSY; return -EBUSY;
} }
if (port->flags & UPF_IOREMAP) { port->membase = devm_ioremap_nocache(port->dev, port->mapbase,
port->membase = devm_ioremap_nocache(port->dev, port->mapsize);
port->mapbase, if (!port->membase)
port->mapsize); return -ENOMEM;
if (port->membase == NULL)
return -ENOMEM;
}
return 0; return 0;
} }
...@@ -623,7 +617,7 @@ static int meson_uart_probe(struct platform_device *pdev) ...@@ -623,7 +617,7 @@ static int meson_uart_probe(struct platform_device *pdev)
port->mapbase = res_mem->start; port->mapbase = res_mem->start;
port->mapsize = resource_size(res_mem); port->mapsize = resource_size(res_mem);
port->irq = res_irq->start; port->irq = res_irq->start;
port->flags = UPF_BOOT_AUTOCONF | UPF_IOREMAP | UPF_LOW_LATENCY; port->flags = UPF_BOOT_AUTOCONF | UPF_LOW_LATENCY;
port->dev = &pdev->dev; port->dev = &pdev->dev;
port->line = pdev->id; port->line = pdev->id;
port->type = PORT_MESON; port->type = PORT_MESON;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册