From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Enrico Weigelt, metux IT consult" Subject: [PATCH v2 32/45] drivers: tty: serial: atmel_serial: use devm_* functions Date: Thu, 14 Mar 2019 23:34:02 +0100 Message-ID: <1552602855-26086-33-git-send-email-info@metux.net> References: <1552602855-26086-1-git-send-email-info@metux.net> Return-path: In-Reply-To: <1552602855-26086-1-git-send-email-info@metux.net> Sender: linux-kernel-owner@vger.kernel.org To: linux-kernel@vger.kernel.org Cc: gregkh@linuxfoundation.org, eric@anholt.net, stefan.wahren@i2se.com, f.fainelli@gmail.com, rjui@broadcom.com, sbranden@broadcom.com, bcm-kernel-feedback-list@broadcom.com, andriy.shevchenko@linux.intel.com, vz@mleia.com, matthias.bgg@gmail.com, yamada.masahiro@socionext.com, tklauser@distanz.ch, richard.genoud@gmail.com, macro@linux-mips.org, u.kleine-koenig@pengutronix.de, kernel@pengutronix.de, slemieux.tyco@gmail.com, andy.gross@linaro.org, david.brown@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, baohua@kernel.org, jacmet@sunsite.dk, linux-serial@vger.kernel.org, linux-arm-msm@vger.kernel.org, linuxppc-dev@lists.ozlabs.org List-Id: linux-serial@vger.kernel.org Use the safer devm versions of memory mapping functions. Signed-off-by: Enrico Weigelt, metux IT consult --- 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