Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b1ecaa6 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Greg Kroah-Hartman
Browse files

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: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ff3b9cad

drivers/tty/serial/meson_uart.c

+8 −14
Original line number Original line Diff line number Diff line
@@ -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_release_mem_region(port->dev, port->mapbase,

					port->mapsize);

	devm_iounmap(port->dev, port->membase);

	devm_iounmap(port->dev, port->membase);

	port->membase = NULL;

	port->membase = NULL;

	}

	devm_release_mem_region(port->dev, port->mapbase, port->mapsize);

}

}





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) 
		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->mapbase,

					     port->mapsize);

					     port->mapsize);

		if (port->membase == NULL)

	if (!port->membase)

		return -ENOMEM;

		return -ENOMEM;

	}





	return 0;

	return 0;

}

}
@@ -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;