linux-amlogic.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: hkallweit1@gmail.com (Heiner Kallweit)
To: linus-amlogic@lists.infradead.org
Subject: [PATCH 4/6] serial: meson: make use of uart_port member mapsize
Date: Sun, 16 Apr 2017 22:15:38 +0200	[thread overview]
Message-ID: <71517d44-fa42-df5e-8f90-c43c504c0282@gmail.com> (raw)
In-Reply-To: <d16f695a-42b2-dfc2-0e53-df110f5a8389@gmail.com>

Member mapsize of struct uart_port is meant to store the resource size.
By using it we can get rid of meson_uart_res_size().

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
 drivers/tty/serial/meson_uart.c | 29 +++++------------------------
 1 file changed, 5 insertions(+), 24 deletions(-)

diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c
index 714b29ad..8d2e7203 100644
--- a/drivers/tty/serial/meson_uart.c
+++ b/drivers/tty/serial/meson_uart.c
@@ -393,26 +393,11 @@ static int meson_uart_verify_port(struct uart_port *port,
 	return ret;
 }
 
-static int meson_uart_res_size(struct uart_port *port)
-{
-	struct platform_device *pdev = to_platform_device(port->dev);
-	struct resource *res;
-
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	if (!res) {
-		dev_err(port->dev, "cannot obtain I/O memory region");
-		return -ENODEV;
-	}
-
-	return resource_size(res);
-}
-
 static void meson_uart_release_port(struct uart_port *port)
 {
-	int size = meson_uart_res_size(port);
-
 	if (port->flags & UPF_IOREMAP) {
-		devm_release_mem_region(port->dev, port->mapbase, size);
+		devm_release_mem_region(port->dev, port->mapbase,
+					port->mapsize);
 		devm_iounmap(port->dev, port->membase);
 		port->membase = NULL;
 	}
@@ -420,12 +405,7 @@ static void meson_uart_release_port(struct uart_port *port)
 
 static int meson_uart_request_port(struct uart_port *port)
 {
-	int size = meson_uart_res_size(port);
-
-	if (size < 0)
-		return size;
-
-	if (!devm_request_mem_region(port->dev, port->mapbase, size,
+	if (!devm_request_mem_region(port->dev, port->mapbase, port->mapsize,
 				     dev_name(port->dev))) {
 		dev_err(port->dev, "Memory region busy\n");
 		return -EBUSY;
@@ -434,7 +414,7 @@ static int meson_uart_request_port(struct uart_port *port)
 	if (port->flags & UPF_IOREMAP) {
 		port->membase = devm_ioremap_nocache(port->dev,
 						     port->mapbase,
-						     size);
+						     port->mapsize);
 		if (port->membase == NULL)
 			return -ENOMEM;
 	}
@@ -629,6 +609,7 @@ static int meson_uart_probe(struct platform_device *pdev)
 	port->uartclk = clk_get_rate(clk);
 	port->iotype = UPIO_MEM;
 	port->mapbase = res_mem->start;
+	port->mapsize = resource_size(res_mem);
 	port->irq = res_irq->start;
 	port->flags = UPF_BOOT_AUTOCONF | UPF_IOREMAP | UPF_LOW_LATENCY;
 	port->dev = &pdev->dev;
-- 
2.12.2

  parent reply	other threads:[~2017-04-16 20:15 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-04-16 20:02 [PATCH 0/6] serial: meson: series with smaller fixes and improvements Heiner Kallweit
2017-04-16 20:06 ` [PATCH 1/6] serial: meson: fix setting number of stop bits Heiner Kallweit
2017-04-17 15:24   ` Neil Armstrong
2017-04-17 15:54     ` Heiner Kallweit
2017-04-21 22:03       ` Kevin Hilman
2017-04-16 20:10 ` [PATCH 2/6] serial: meson: remove dead code in meson_uart_change_speed Heiner Kallweit
2017-04-17 15:25   ` Neil Armstrong
2017-04-17 15:54     ` Andreas Färber
2017-04-16 20:13 ` [PATCH 3/6] serial: meson: remove unneeded variable assignment in meson_serial_port_write Heiner Kallweit
2017-04-17 13:58   ` Ben Dooks
2017-04-17 15:27     ` Neil Armstrong
2017-04-17 15:37       ` Andreas Färber
2017-04-17 16:03         ` Heiner Kallweit
2017-04-19  8:39         ` Neil Armstrong
2017-04-16 20:15 ` Heiner Kallweit [this message]
2017-04-17 13:53   ` [PATCH 4/6] serial: meson: make use of uart_port member mapsize Ben Dooks
2017-04-17 15:28   ` Neil Armstrong
2017-04-16 20:21 ` [PATCH 5/6] serial: meson: remove use of flag UPF_IOREMAP Heiner Kallweit
2017-04-17 15:28   ` Neil Armstrong
2017-04-16 20:23 ` [PATCH 6/6] serial: meson: change interrupt description to of node name Heiner Kallweit
2017-04-17 13:52   ` Ben Dooks
2017-04-17 15:29   ` Neil Armstrong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=71517d44-fa42-df5e-8f90-c43c504c0282@gmail.com \
    --to=hkallweit1@gmail.com \
    --cc=linus-amlogic@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).