Use the safer devm versions of memory mapping functions.

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

diff --git a/drivers/tty/serial/atmel_serial.c 
b/drivers/tty/serial/atmel_serial.c
index 05147fe..084f106 100644
--- a/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@ -2389,10 +2389,10 @@ static void atmel_release_port(struct uart_port *port)
        struct platform_device *mpdev = to_platform_device(port->dev->parent);
        int size = resource_size(mpdev->resource);
 
-       release_mem_region(port->mapbase, size);
+       devm_release_mem_region(port->dev, port->mapbase, size);
 
        if (port->flags & UPF_IOREMAP) {
-               iounmap(port->membase);
+               devm_iounmap(port->dev, port->membase);
                port->membase = NULL;
        }
 }
@@ -2405,13 +2405,16 @@ static int atmel_request_port(struct uart_port *port)
        struct platform_device *mpdev = to_platform_device(port->dev->parent);
        int size = resource_size(mpdev->resource);
 
-       if (!request_mem_region(port->mapbase, size, "atmel_serial"))
+       if (!devm_request_mem_region(port->dev,
+                                    port->mapbase,
+                                    size,
+                                    "atmel_serial"))
                return -EBUSY;
 
        if (port->flags & UPF_IOREMAP) {
-               port->membase = ioremap(port->mapbase, size);
+               port->membase = devm_ioremap(port->dev, port->mapbase, size);
                if (port->membase == NULL) {
-                       release_mem_region(port->mapbase, size);
+                       devm_release_mem_region(port->dev, port->mapbase, size);
                        return -ENOMEM;
                }
        }
-- 
1.9.1

Reply via email to