[PATCH v2 36/45] drivers: tty: serial: pic32_uart: use devm_* functions
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: 2019-03-14 22:35:29
Also in:
linux-arm-msm, linux-serial, lkml
Subsystem:
the rest, tty layer and serial drivers · Maintainers:
Linus Torvalds, Greg Kroah-Hartman, Jiri Slaby
Use the safer devm versions of memory mapping functions. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net> --- drivers/tty/serial/pic32_uart.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/tty/serial/pic32_uart.c b/drivers/tty/serial/pic32_uart.c
index 0bdf168..b4f0b29 100644
--- a/drivers/tty/serial/pic32_uart.c
+++ b/drivers/tty/serial/pic32_uart.c@@ -614,15 +614,19 @@ static int pic32_uart_request_port(struct uart_port *port) if (unlikely(!res_mem)) return -EINVAL; - if (!request_mem_region(port->mapbase, resource_size(res_mem), - "pic32_uart_mem")) + if (!devm_request_mem_region(port->dev, + port->mapbase, + resource_size(res_mem), + "pic32_uart_mem")) return -EBUSY; port->membase = devm_ioremap_nocache(port->dev, port->mapbase, resource_size(res_mem)); if (!port->membase) { dev_err(port->dev, "Unable to map registers\n"); - release_mem_region(port->mapbase, resource_size(res_mem)); + devm_release_mem_region(port->dev, + port->mapbase, + resource_size(res_mem)); return -ENOMEM; }
@@ -641,7 +645,7 @@ static void pic32_uart_release_port(struct uart_port *port) return; res_size = resource_size(res_mem); - release_mem_region(port->mapbase, res_size); + devm_release_mem_region(port->dev, port->mapbase, res_size); } /* serial core request to do any port required auto-configuration */
--
1.9.1