lkml.org 
[lkml]   [2019]   [Mar]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v2 16/45] drivers: tty: serial: uartlite: use devm_* functions
Date
Use the safer devm versions of memory mapping functions.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
drivers/tty/serial/uartlite.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/drivers/tty/serial/uartlite.c b/drivers/tty/serial/uartlite.c
index aa461b8..f068d00 100644
--- a/drivers/tty/serial/uartlite.c
+++ b/drivers/tty/serial/uartlite.c
@@ -342,8 +342,8 @@ static const char *ulite_type(struct uart_port *port)

static void ulite_release_port(struct uart_port *port)
{
- release_mem_region(port->mapbase, ULITE_REGION);
- iounmap(port->membase);
+ devm_release_mem_region(port->dev, port->mapbase, ULITE_REGION);
+ devm_iounmap(port->dev, port->membase);
port->membase = NULL;
}

@@ -355,15 +355,20 @@ static int ulite_request_port(struct uart_port *port)
dev_dbg(port->dev, "ulite console: port=%p; port->mapbase=%llx\n",
port, (unsigned long long) port->mapbase);

- if (!request_mem_region(port->mapbase, ULITE_REGION, "uartlite")) {
+ if (!devm_request_mem_region(port->dev,
+ port->mapbase,
+ ULITE_REGION,
+ "uartlite")) {
dev_err(port->dev, "Memory region busy\n");
return -EBUSY;
}

- port->membase = ioremap(port->mapbase, ULITE_REGION);
+ port->membase = devm_ioremap(port->dev, port->mapbase, ULITE_REGION);
if (!port->membase) {
dev_err(port->dev, "Unable to map registers\n");
- release_mem_region(port->mapbase, ULITE_REGION);
+ devm_release_mem_region(port->dev,
+ port->mapbase,
+ ULITE_REGION);
return -EBUSY;
}

--
1.9.1
\
 
 \ /
  Last update: 2019-03-14 23:38    [W:0.309 / U:0.024 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site