[PATCH v2 19/45] drivers: tty: serial: sh-sci: use devm_* functions

[Enrico Weigelt, metux IT consult]

Use the safer devm versions of memory mapping functions.

Signed-off-by: Enrico Weigelt, metux IT consult <i...@metux.net>
---
 drivers/tty/serial/sh-sci.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 060fcd4..e40b0d0 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -2667,7 +2667,9 @@ static int sci_remap_port(struct uart_port *port)
                return 0;
 
        if (port->dev->of_node || (port->flags & UPF_IOREMAP)) {
-               port->membase = ioremap_nocache(port->mapbase, sport->reg_size);
+               port->membase = devm_ioremap_nocache(port->dev,
+                                                    port->mapbase,
+                                                    sport->reg_size);
                if (unlikely(!port->membase)) {
                        dev_err(port->dev, "can't remap port#%d\n", port->line);
                        return -ENXIO;
@@ -2689,11 +2691,11 @@ static void sci_release_port(struct uart_port *port)
        struct sci_port *sport = to_sci_port(port);
 
        if (port->dev->of_node || (port->flags & UPF_IOREMAP)) {
-               iounmap(port->membase);
+               devm_iounmap(port->dev, port->membase);
                port->membase = NULL;
        }
 
-       release_mem_region(port->mapbase, sport->reg_size);
+       devm_release_mem_region(port->dev, port->mapbase, sport->reg_size);
 }
 
 static int sci_request_port(struct uart_port *port)
@@ -2702,8 +2704,10 @@ static int sci_request_port(struct uart_port *port)
        struct sci_port *sport = to_sci_port(port);
        int ret;
 
-       res = request_mem_region(port->mapbase, sport->reg_size,
-                                dev_name(port->dev));
+       res = devm_request_mem_region(port->dev,
+                                     port->mapbase,
+                                     sport->reg_size,
+                                     dev_name(port->dev));
        if (unlikely(res == NULL)) {
                dev_err(port->dev, "request_mem_region failed.");
                return -EBUSY;
-- 
1.9.1