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 35/45] drivers: tty: serial: lpc32xx_hs: 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/lpc32xx_hs.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/drivers/tty/serial/lpc32xx_hs.c b/drivers/tty/serial/lpc32xx_hs.c
index f4e27d0..0bb86d7 100644
--- a/drivers/tty/serial/lpc32xx_hs.c
+++ b/drivers/tty/serial/lpc32xx_hs.c
@@ -575,11 +575,11 @@ static void serial_lpc32xx_release_port(struct uart_port *port)
{
if ((port->iotype == UPIO_MEM32) && (port->mapbase)) {
if (port->flags & UPF_IOREMAP) {
- iounmap(port->membase);
+ devm_iounmap(port->dev, port->membase);
port->membase = NULL;
}

- release_mem_region(port->mapbase, SZ_4K);
+ devm_release_mem_region(port->dev, port->mapbase, SZ_4K);
}
}

@@ -590,12 +590,19 @@ static int serial_lpc32xx_request_port(struct uart_port *port)
if ((port->iotype == UPIO_MEM32) && (port->mapbase)) {
ret = 0;

- if (!request_mem_region(port->mapbase, SZ_4K, MODNAME))
+ if (!devm_request_mem_region(port->dev,
+ port->mapbase,
+ SZ_4K,
+ MODNAME))
ret = -EBUSY;
else if (port->flags & UPF_IOREMAP) {
- port->membase = ioremap(port->mapbase, SZ_4K);
+ port->membase = devm_ioremap(port->dev,
+ port->mapbase,
+ SZ_4K);
if (!port->membase) {
- release_mem_region(port->mapbase, SZ_4K);
+ devm_release_mem_region(port->dev,
+ port->mapbase,
+ SZ_4K);
ret = -ENOMEM;
}
}
--
1.9.1
\
 
 \ /
  Last update: 2019-03-14 23:35    [W:0.136 / U:0.812 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site