* [PATCH v2 13/45] drivers: tty: serial: 21285: use devm_* functions
From: Enrico Weigelt, metux IT consult @ 2019-03-14 22:33 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arm-msm, yamada.masahiro, macro, jacmet, festevam,
stefan.wahren, f.fainelli, bcm-kernel-feedback-list, linux-imx,
linux-serial, u.kleine-koenig, andy.gross, tklauser, david.brown,
rjui, s.hauer, slemieux.tyco, linuxppc-dev, vz, matthias.bgg,
andriy.shevchenko, baohua, sbranden, eric, richard.genoud, gregkh,
kernel, shawnguo
In-Reply-To: <1552602855-26086-1-git-send-email-info@metux.net>
Use the safer devm versions of memory mapping functions.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
drivers/tty/serial/21285.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/tty/serial/21285.c b/drivers/tty/serial/21285.c
index 32b3acf..4ce2de2 100644
--- a/drivers/tty/serial/21285.c
+++ b/drivers/tty/serial/21285.c
@@ -305,12 +305,13 @@ static const char *serial21285_type(struct uart_port *port)
static void serial21285_release_port(struct uart_port *port)
{
- release_mem_region(port->mapbase, 32);
+ devm_release_mem_region(port->dev, port->mapbase, 32);
}
static int serial21285_request_port(struct uart_port *port)
{
- return request_mem_region(port->mapbase, 32, serial21285_name)
+ return devm_request_mem_region(port->dev, port->mapbase,
+ 32, serial21285_name)
!= NULL ? 0 : -EBUSY;
}
--
1.9.1
^ permalink raw reply related
* [PATCH v2 05/45] drivers: tty: serial: sirfsoc_uart: use devm_ioremap_resource()
From: Enrico Weigelt, metux IT consult @ 2019-03-14 22:33 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arm-msm, yamada.masahiro, macro, jacmet, festevam,
stefan.wahren, f.fainelli, bcm-kernel-feedback-list, linux-imx,
linux-serial, u.kleine-koenig, andy.gross, tklauser, david.brown,
rjui, s.hauer, slemieux.tyco, linuxppc-dev, vz, matthias.bgg,
andriy.shevchenko, baohua, sbranden, eric, richard.genoud, gregkh,
kernel, shawnguo
In-Reply-To: <1552602855-26086-1-git-send-email-info@metux.net>
Instead of fetching out data from a struct resource for passing
it to devm_ioremap(), directly use devm_ioremap_resource()
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
drivers/tty/serial/sirfsoc_uart.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/tty/serial/sirfsoc_uart.c b/drivers/tty/serial/sirfsoc_uart.c
index 38622f2..db2e08d 100644
--- a/drivers/tty/serial/sirfsoc_uart.c
+++ b/drivers/tty/serial/sirfsoc_uart.c
@@ -1359,8 +1359,7 @@ static int sirfsoc_uart_probe(struct platform_device *pdev)
goto err;
}
port->mapbase = res->start;
- port->membase = devm_ioremap(&pdev->dev,
- res->start, resource_size(res));
+ port->membase = devm_ioremap_resource(&pdev->dev, res);
if (!port->membase) {
dev_err(&pdev->dev, "Cannot remap resource.\n");
ret = -ENOMEM;
--
1.9.1
^ permalink raw reply related
* [PATCH v2 18/45] drivers: tty: serial: sirfsoc_uart: use devm_* functions
From: Enrico Weigelt, metux IT consult @ 2019-03-14 22:33 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arm-msm, yamada.masahiro, macro, jacmet, festevam,
stefan.wahren, f.fainelli, bcm-kernel-feedback-list, linux-imx,
linux-serial, u.kleine-koenig, andy.gross, tklauser, david.brown,
rjui, s.hauer, slemieux.tyco, linuxppc-dev, vz, matthias.bgg,
andriy.shevchenko, baohua, sbranden, eric, richard.genoud, gregkh,
kernel, shawnguo
In-Reply-To: <1552602855-26086-1-git-send-email-info@metux.net>
Use the safer devm versions of memory mapping functions.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
drivers/tty/serial/sirfsoc_uart.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/tty/serial/sirfsoc_uart.c b/drivers/tty/serial/sirfsoc_uart.c
index db2e08d..64ea1e7 100644
--- a/drivers/tty/serial/sirfsoc_uart.c
+++ b/drivers/tty/serial/sirfsoc_uart.c
@@ -1042,14 +1042,14 @@ static int sirfsoc_uart_request_port(struct uart_port *port)
struct sirfsoc_uart_port *sirfport = to_sirfport(port);
struct sirfsoc_uart_param *uart_param = &sirfport->uart_reg->uart_param;
void *ret;
- ret = request_mem_region(port->mapbase,
+ ret = devm_request_mem_region(port->dev, port->mapbase,
SIRFUART_MAP_SIZE, uart_param->port_name);
return ret ? 0 : -EBUSY;
}
static void sirfsoc_uart_release_port(struct uart_port *port)
{
- release_mem_region(port->mapbase, SIRFUART_MAP_SIZE);
+ devm_release_mem_region(port->dev, port->mapbase, SIRFUART_MAP_SIZE);
}
static void sirfsoc_uart_config_port(struct uart_port *port, int flags)
--
1.9.1
^ permalink raw reply related
* [PATCH v2 14/45] drivers: tty: serial: vr41xx_siu: use devm_* functions
From: Enrico Weigelt, metux IT consult @ 2019-03-14 22:33 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arm-msm, yamada.masahiro, macro, jacmet, festevam,
stefan.wahren, f.fainelli, bcm-kernel-feedback-list, linux-imx,
linux-serial, u.kleine-koenig, andy.gross, tklauser, david.brown,
rjui, s.hauer, slemieux.tyco, linuxppc-dev, vz, matthias.bgg,
andriy.shevchenko, baohua, sbranden, eric, richard.genoud, gregkh,
kernel, shawnguo
In-Reply-To: <1552602855-26086-1-git-send-email-info@metux.net>
Use the safer devm versions of memory mapping functions.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
drivers/tty/serial/vr41xx_siu.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/tty/serial/vr41xx_siu.c b/drivers/tty/serial/vr41xx_siu.c
index 6d106e3..3f69603 100644
--- a/drivers/tty/serial/vr41xx_siu.c
+++ b/drivers/tty/serial/vr41xx_siu.c
@@ -617,12 +617,12 @@ static void siu_release_port(struct uart_port *port)
unsigned long size;
if (port->flags & UPF_IOREMAP) {
- iounmap(port->membase);
+ devm_iounmap(port->dev, port->membase);
port->membase = NULL;
}
size = siu_port_size(port);
- release_mem_region(port->mapbase, size);
+ devm_release_mem_region(port->dev, port->mapbase, size);
}
static int siu_request_port(struct uart_port *port)
@@ -631,12 +631,15 @@ static int siu_request_port(struct uart_port *port)
struct resource *res;
size = siu_port_size(port);
- res = request_mem_region(port->mapbase, size, siu_type_name(port));
+ res = devm_request_mem_region(port->dev,
+ port->mapbase,
+ size,
+ siu_type_name(port));
if (res == NULL)
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_resource(res);
return -ENOMEM;
--
1.9.1
^ permalink raw reply related
* [PATCH v2 24/45] drivers: tty: serial: mxs-auart: use devm_* functions
From: Enrico Weigelt, metux IT consult @ 2019-03-14 22:33 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arm-msm, yamada.masahiro, macro, jacmet, festevam,
stefan.wahren, f.fainelli, bcm-kernel-feedback-list, linux-imx,
linux-serial, u.kleine-koenig, andy.gross, tklauser, david.brown,
rjui, s.hauer, slemieux.tyco, linuxppc-dev, vz, matthias.bgg,
andriy.shevchenko, baohua, sbranden, eric, richard.genoud, gregkh,
kernel, shawnguo
In-Reply-To: <1552602855-26086-1-git-send-email-info@metux.net>
Use the safer devm versions of memory mapping functions.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
drivers/tty/serial/mxs-auart.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c
index 27235a5..0a43c69 100644
--- a/drivers/tty/serial/mxs-auart.c
+++ b/drivers/tty/serial/mxs-auart.c
@@ -1685,7 +1685,7 @@ static int mxs_auart_probe(struct platform_device *pdev)
}
s->port.mapbase = r->start;
- s->port.membase = ioremap(r->start, resource_size(r));
+ s->port.membase = devm_ioremap_resource(s->port.dev, r);
s->port.ops = &mxs_auart_ops;
s->port.iotype = UPIO_MEM;
s->port.fifosize = MXS_AUART_FIFO_SIZE;
--
1.9.1
^ permalink raw reply related
* [PATCH v2 16/45] drivers: tty: serial: uartlite: use devm_* functions
From: Enrico Weigelt, metux IT consult @ 2019-03-14 22:33 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arm-msm, yamada.masahiro, macro, jacmet, festevam,
stefan.wahren, f.fainelli, bcm-kernel-feedback-list, linux-imx,
linux-serial, u.kleine-koenig, andy.gross, tklauser, david.brown,
rjui, s.hauer, slemieux.tyco, linuxppc-dev, vz, matthias.bgg,
andriy.shevchenko, baohua, sbranden, eric, richard.genoud, gregkh,
kernel, shawnguo
In-Reply-To: <1552602855-26086-1-git-send-email-info@metux.net>
Use the safer devm versions of memory mapping functions.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
drivers/tty/serial/uartlite.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/drivers/tty/serial/uartlite.c b/drivers/tty/serial/uartlite.c
index aa461b8..f068d00 100644
--- a/drivers/tty/serial/uartlite.c
+++ b/drivers/tty/serial/uartlite.c
@@ -342,8 +342,8 @@ static const char *ulite_type(struct uart_port *port)
static void ulite_release_port(struct uart_port *port)
{
- release_mem_region(port->mapbase, ULITE_REGION);
- iounmap(port->membase);
+ devm_release_mem_region(port->dev, port->mapbase, ULITE_REGION);
+ devm_iounmap(port->dev, port->membase);
port->membase = NULL;
}
@@ -355,15 +355,20 @@ static int ulite_request_port(struct uart_port *port)
dev_dbg(port->dev, "ulite console: port=%p; port->mapbase=%llx\n",
port, (unsigned long long) port->mapbase);
- if (!request_mem_region(port->mapbase, ULITE_REGION, "uartlite")) {
+ if (!devm_request_mem_region(port->dev,
+ port->mapbase,
+ ULITE_REGION,
+ "uartlite")) {
dev_err(port->dev, "Memory region busy\n");
return -EBUSY;
}
- port->membase = ioremap(port->mapbase, ULITE_REGION);
+ port->membase = devm_ioremap(port->dev, port->mapbase, ULITE_REGION);
if (!port->membase) {
dev_err(port->dev, "Unable to map registers\n");
- release_mem_region(port->mapbase, ULITE_REGION);
+ devm_release_mem_region(port->dev,
+ port->mapbase,
+ ULITE_REGION);
return -EBUSY;
}
--
1.9.1
^ permalink raw reply related
* [PATCH v2 21/45] drivers: tty: serial: altera_jtaguart: use devm_* functions
From: Enrico Weigelt, metux IT consult @ 2019-03-14 22:33 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arm-msm, yamada.masahiro, macro, jacmet, festevam,
stefan.wahren, f.fainelli, bcm-kernel-feedback-list, linux-imx,
linux-serial, u.kleine-koenig, andy.gross, tklauser, david.brown,
rjui, s.hauer, slemieux.tyco, linuxppc-dev, vz, matthias.bgg,
andriy.shevchenko, baohua, sbranden, eric, richard.genoud, gregkh,
kernel, shawnguo
In-Reply-To: <1552602855-26086-1-git-send-email-info@metux.net>
Use the safer devm versions of memory mapping functions.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
drivers/tty/serial/altera_jtaguart.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/tty/serial/altera_jtaguart.c b/drivers/tty/serial/altera_jtaguart.c
index c90e503..13cab5d 100644
--- a/drivers/tty/serial/altera_jtaguart.c
+++ b/drivers/tty/serial/altera_jtaguart.c
@@ -448,7 +448,9 @@ static int altera_jtaguart_probe(struct platform_device *pdev)
else
return -ENODEV;
- port->membase = ioremap(port->mapbase, ALTERA_JTAGUART_SIZE);
+ port->membase = devm_ioremap(port->dev,
+ port->mapbase,
+ ALTERA_JTAGUART_SIZE);
if (!port->membase)
return -ENOMEM;
@@ -474,7 +476,7 @@ static int altera_jtaguart_remove(struct platform_device *pdev)
port = &altera_jtaguart_ports[i].port;
uart_remove_one_port(&altera_jtaguart_driver, port);
- iounmap(port->membase);
+ devm_iounmap(port->dev, port->membase);
return 0;
}
--
1.9.1
^ permalink raw reply related
* [PATCH v2 07/45] drivers: tty: serial: 8250_uniphier: use devm_ioremap_resource()
From: Enrico Weigelt, metux IT consult @ 2019-03-14 22:33 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arm-msm, yamada.masahiro, macro, jacmet, festevam,
stefan.wahren, f.fainelli, bcm-kernel-feedback-list, linux-imx,
linux-serial, u.kleine-koenig, andy.gross, tklauser, david.brown,
rjui, s.hauer, slemieux.tyco, linuxppc-dev, vz, matthias.bgg,
andriy.shevchenko, baohua, sbranden, eric, richard.genoud, gregkh,
kernel, shawnguo
In-Reply-To: <1552602855-26086-1-git-send-email-info@metux.net>
Instead of fetching out data from a struct resource for passing
it to devm_ioremap(), directly use devm_ioremap_resource()
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
drivers/tty/serial/8250/8250_uniphier.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/tty/serial/8250/8250_uniphier.c b/drivers/tty/serial/8250/8250_uniphier.c
index 164ba13..9c1244e 100644
--- a/drivers/tty/serial/8250/8250_uniphier.c
+++ b/drivers/tty/serial/8250/8250_uniphier.c
@@ -171,7 +171,7 @@ static int uniphier_uart_probe(struct platform_device *pdev)
return -EINVAL;
}
- membase = devm_ioremap(dev, regs->start, resource_size(regs));
+ membase = devm_ioremap_resource(dev, regs);
if (!membase)
return -ENOMEM;
--
1.9.1
^ permalink raw reply related
* [PATCH v2 06/45] drivers: tty: serial: samsung: use devm_ioremap_resource()
From: Enrico Weigelt, metux IT consult @ 2019-03-14 22:33 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arm-msm, yamada.masahiro, macro, jacmet, festevam,
stefan.wahren, f.fainelli, bcm-kernel-feedback-list, linux-imx,
linux-serial, u.kleine-koenig, andy.gross, tklauser, david.brown,
rjui, s.hauer, slemieux.tyco, linuxppc-dev, vz, matthias.bgg,
andriy.shevchenko, baohua, sbranden, eric, richard.genoud, gregkh,
kernel, shawnguo
In-Reply-To: <1552602855-26086-1-git-send-email-info@metux.net>
Instead of fetching out data from a struct resource for passing
it to devm_ioremap(), directly use devm_ioremap_resource()
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
drivers/tty/serial/samsung.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
index 83fd516..a49cf15 100644
--- a/drivers/tty/serial/samsung.c
+++ b/drivers/tty/serial/samsung.c
@@ -1775,7 +1775,7 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
dbg("resource %pR)\n", res);
- port->membase = devm_ioremap(port->dev, res->start, resource_size(res));
+ port->membase = devm_ioremap_resource(port->dev, res);
if (!port->membase) {
dev_err(port->dev, "failed to remap controller address\n");
return -EBUSY;
--
1.9.1
^ permalink raw reply related
* [PATCH v2 29/45] drivers: tty: serial: serial_txx9: use devm_* functions
From: Enrico Weigelt, metux IT consult @ 2019-03-14 22:33 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arm-msm, yamada.masahiro, macro, jacmet, festevam,
stefan.wahren, f.fainelli, bcm-kernel-feedback-list, linux-imx,
linux-serial, u.kleine-koenig, andy.gross, tklauser, david.brown,
rjui, s.hauer, slemieux.tyco, linuxppc-dev, vz, matthias.bgg,
andriy.shevchenko, baohua, sbranden, eric, richard.genoud, gregkh,
kernel, shawnguo
In-Reply-To: <1552602855-26086-1-git-send-email-info@metux.net>
Use the safer devm versions of memory mapping functions.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
drivers/tty/serial/serial_txx9.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/drivers/tty/serial/serial_txx9.c b/drivers/tty/serial/serial_txx9.c
index 1b4008d..aa01349 100644
--- a/drivers/tty/serial/serial_txx9.c
+++ b/drivers/tty/serial/serial_txx9.c
@@ -757,15 +757,22 @@ static int serial_txx9_request_resource(struct uart_txx9_port *up)
if (!up->port.mapbase)
break;
- if (!request_mem_region(up->port.mapbase, size, "serial_txx9")) {
+ if (!devm_request_mem_region(up->port.dev,
+ up->port.mapbase,
+ size,
+ "serial_txx9")) {
ret = -EBUSY;
break;
}
if (up->port.flags & UPF_IOREMAP) {
- up->port.membase = ioremap(up->port.mapbase, size);
+ up->port.membase = devm_ioremap(up->port.dev,
+ up->port.mapbase,
+ size);
if (!up->port.membase) {
- release_mem_region(up->port.mapbase, size);
+ devm_release_mem_region(up->port.dev,
+ up->port.mapbase,
+ size);
ret = -ENOMEM;
}
}
@@ -789,11 +796,11 @@ static void serial_txx9_release_resource(struct uart_txx9_port *up)
break;
if (up->port.flags & UPF_IOREMAP) {
- iounmap(up->port.membase);
+ devm_iounmap(up->port.dev, up->port.membase);
up->port.membase = NULL;
}
- release_mem_region(up->port.mapbase, size);
+ devm_release_mem_region(up->port.dev, up->port.mapbase, size);
break;
case UPIO_PORT:
--
1.9.1
^ permalink raw reply related
* [PATCH v2 28/45] drivers: tty: serial: netx-serial: use devm_* functions
From: Enrico Weigelt, metux IT consult @ 2019-03-14 22:33 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arm-msm, yamada.masahiro, macro, jacmet, festevam,
stefan.wahren, f.fainelli, bcm-kernel-feedback-list, linux-imx,
linux-serial, u.kleine-koenig, andy.gross, tklauser, david.brown,
rjui, s.hauer, slemieux.tyco, linuxppc-dev, vz, matthias.bgg,
andriy.shevchenko, baohua, sbranden, eric, richard.genoud, gregkh,
kernel, shawnguo
In-Reply-To: <1552602855-26086-1-git-send-email-info@metux.net>
Use the safer devm versions of memory mapping functions.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
drivers/tty/serial/netx-serial.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/tty/serial/netx-serial.c b/drivers/tty/serial/netx-serial.c
index b355686..a696d96 100644
--- a/drivers/tty/serial/netx-serial.c
+++ b/drivers/tty/serial/netx-serial.c
@@ -424,12 +424,13 @@ static const char *netx_type(struct uart_port *port)
static void netx_release_port(struct uart_port *port)
{
- release_mem_region(port->mapbase, UART_PORT_SIZE);
+ devm_release_mem_region(port->dev, port->mapbase, UART_PORT_SIZE);
}
static int netx_request_port(struct uart_port *port)
{
- return request_mem_region(port->mapbase, UART_PORT_SIZE,
+ return devm_request_mem_region(port->dev,
+ port->mapbase, UART_PORT_SIZE,
DRIVER_NAME) != NULL ? 0 : -EBUSY;
}
--
1.9.1
^ permalink raw reply related
* [PATCH v2 35/45] drivers: tty: serial: lpc32xx_hs: use devm_* functions
From: Enrico Weigelt, metux IT consult @ 2019-03-14 22:34 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arm-msm, yamada.masahiro, macro, jacmet, festevam,
stefan.wahren, f.fainelli, bcm-kernel-feedback-list, linux-imx,
linux-serial, u.kleine-koenig, andy.gross, tklauser, david.brown,
rjui, s.hauer, slemieux.tyco, linuxppc-dev, vz, matthias.bgg,
andriy.shevchenko, baohua, sbranden, eric, richard.genoud, gregkh,
kernel, shawnguo
In-Reply-To: <1552602855-26086-1-git-send-email-info@metux.net>
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
^ permalink raw reply related
* [PATCH v2 36/45] drivers: tty: serial: pic32_uart: use devm_* functions
From: Enrico Weigelt, metux IT consult @ 2019-03-14 22:34 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arm-msm, yamada.masahiro, macro, jacmet, festevam,
stefan.wahren, f.fainelli, bcm-kernel-feedback-list, linux-imx,
linux-serial, u.kleine-koenig, andy.gross, tklauser, david.brown,
rjui, s.hauer, slemieux.tyco, linuxppc-dev, vz, matthias.bgg,
andriy.shevchenko, baohua, sbranden, eric, richard.genoud, gregkh,
kernel, shawnguo
In-Reply-To: <1552602855-26086-1-git-send-email-info@metux.net>
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
^ permalink raw reply related
* [PATCH v2 40/45] drivers: tty: serial: mpc52xx_uart: use devm_* functions
From: Enrico Weigelt, metux IT consult @ 2019-03-14 22:34 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arm-msm, yamada.masahiro, macro, jacmet, festevam,
stefan.wahren, f.fainelli, bcm-kernel-feedback-list, linux-imx,
linux-serial, u.kleine-koenig, andy.gross, tklauser, david.brown,
rjui, s.hauer, slemieux.tyco, linuxppc-dev, vz, matthias.bgg,
andriy.shevchenko, baohua, sbranden, eric, richard.genoud, gregkh,
kernel, shawnguo
In-Reply-To: <1552602855-26086-1-git-send-email-info@metux.net>
Use the safer devm versions of memory mapping functions.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
drivers/tty/serial/mpc52xx_uart.c | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/drivers/tty/serial/mpc52xx_uart.c b/drivers/tty/serial/mpc52xx_uart.c
index 3a75ee0..3e74e44 100644
--- a/drivers/tty/serial/mpc52xx_uart.c
+++ b/drivers/tty/serial/mpc52xx_uart.c
@@ -1276,11 +1276,13 @@ static u8 mpc5125_psc_get_mr1(struct uart_port *port)
/* remapped by us ? */
if (port->flags & UPF_IOREMAP) {
- iounmap(port->membase);
+ devm_iounmap(port->dev, port->membase);
port->membase = NULL;
}
- release_mem_region(port->mapbase, sizeof(struct mpc52xx_psc));
+ devm_release_mem_region(port->dev,
+ port->mapbase,
+ sizeof(struct mpc52xx_psc));
}
static int
@@ -1289,13 +1291,14 @@ static u8 mpc5125_psc_get_mr1(struct uart_port *port)
int err;
if (port->flags & UPF_IOREMAP) /* Need to remap ? */
- port->membase = ioremap(port->mapbase,
+ port->membase = devm_ioremap(port->dev, port->mapbase,
sizeof(struct mpc52xx_psc));
if (!port->membase)
return -EINVAL;
- err = request_mem_region(port->mapbase, sizeof(struct mpc52xx_psc),
+ err = devm_request_mem_region(port->mapbase,
+ sizeof(struct mpc52xx_psc),
"mpc52xx_psc_uart") != NULL ? 0 : -EBUSY;
if (err)
@@ -1310,10 +1313,12 @@ static u8 mpc5125_psc_get_mr1(struct uart_port *port)
return 0;
out_mapregion:
- release_mem_region(port->mapbase, sizeof(struct mpc52xx_psc));
+ devm_release_mem_region(port->dev,
+ port->mapbase,
+ sizeof(struct mpc52xx_psc));
out_membase:
if (port->flags & UPF_IOREMAP) {
- iounmap(port->membase);
+ devm_iounmap(port->dev, port->membase);
port->membase = NULL;
}
return err;
@@ -1653,7 +1658,9 @@ static u8 mpc5125_psc_get_mr1(struct uart_port *port)
port->uartclk = uartclk;
port->ops = &mpc52xx_uart_ops;
port->mapbase = res.start;
- port->membase = ioremap(res.start, sizeof(struct mpc52xx_psc));
+ port->membase = devm_ioremap(port->dev,
+ res.start,
+ sizeof(struct mpc52xx_psc));
port->irq = irq_of_parse_and_map(np, 0);
if (port->membase == NULL)
--
1.9.1
^ permalink raw reply related
* [PATCH v2 42/45] drivers: tty: serial: sa1100: use devm_* functions
From: Enrico Weigelt, metux IT consult @ 2019-03-14 22:34 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arm-msm, yamada.masahiro, macro, jacmet, festevam,
stefan.wahren, f.fainelli, bcm-kernel-feedback-list, linux-imx,
linux-serial, u.kleine-koenig, andy.gross, tklauser, david.brown,
rjui, s.hauer, slemieux.tyco, linuxppc-dev, vz, matthias.bgg,
andriy.shevchenko, baohua, sbranden, eric, richard.genoud, gregkh,
kernel, shawnguo
In-Reply-To: <1552602855-26086-1-git-send-email-info@metux.net>
Use the safer devm versions of memory mapping functions.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
drivers/tty/serial/sa1100.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/tty/serial/sa1100.c b/drivers/tty/serial/sa1100.c
index a399772b..3aa20a2 100644
--- a/drivers/tty/serial/sa1100.c
+++ b/drivers/tty/serial/sa1100.c
@@ -522,7 +522,7 @@ static void sa1100_release_port(struct uart_port *port)
struct sa1100_port *sport =
container_of(port, struct sa1100_port, port);
- release_mem_region(sport->port.mapbase, UART_PORT_SIZE);
+ devm_release_mem_region(port->dev, sport->port.mapbase, UART_PORT_SIZE);
}
/*
@@ -533,7 +533,7 @@ static int sa1100_request_port(struct uart_port *port)
struct sa1100_port *sport =
container_of(port, struct sa1100_port, port);
- return request_mem_region(sport->port.mapbase, UART_PORT_SIZE,
+ return devm_request_mem_region(port->dev, port->mapbase, UART_PORT_SIZE,
"sa11x0-uart") != NULL ? 0 : -EBUSY;
}
--
1.9.1
^ permalink raw reply related
* [PATCH v2 22/45] drivers: tty: serial: altera_uart: use devm_* functions
From: Enrico Weigelt, metux IT consult @ 2019-03-14 22:33 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arm-msm, yamada.masahiro, macro, jacmet, festevam,
stefan.wahren, f.fainelli, bcm-kernel-feedback-list, linux-imx,
linux-serial, u.kleine-koenig, andy.gross, tklauser, david.brown,
rjui, s.hauer, slemieux.tyco, linuxppc-dev, vz, matthias.bgg,
andriy.shevchenko, baohua, sbranden, eric, richard.genoud, gregkh,
kernel, shawnguo
In-Reply-To: <1552602855-26086-1-git-send-email-info@metux.net>
Use the safer devm versions of memory mapping functions.
The iounmap() call isn't necessary anymore, as devm will clean up.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
drivers/tty/serial/altera_uart.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/tty/serial/altera_uart.c b/drivers/tty/serial/altera_uart.c
index 0e487ce..d4f7150 100644
--- a/drivers/tty/serial/altera_uart.c
+++ b/drivers/tty/serial/altera_uart.c
@@ -595,7 +595,9 @@ static int altera_uart_probe(struct platform_device *pdev)
return ret;
}
- port->membase = ioremap(port->mapbase, ALTERA_UART_SIZE);
+ port->membase = devm_ioremap(port->dev,
+ port->mapbase,
+ ALTERA_UART_SIZE);
if (!port->membase)
return -ENOMEM;
@@ -625,7 +627,6 @@ static int altera_uart_remove(struct platform_device *pdev)
if (port) {
uart_remove_one_port(&altera_uart_driver, port);
port->mapbase = 0;
- iounmap(port->membase);
}
return 0;
--
1.9.1
^ permalink raw reply related
* [PATCH v2 43/45] drivers: tty: serial: pmac_zilog: use devm_* functions
From: Enrico Weigelt, metux IT consult @ 2019-03-14 22:34 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arm-msm, yamada.masahiro, macro, jacmet, festevam,
stefan.wahren, f.fainelli, bcm-kernel-feedback-list, linux-imx,
linux-serial, u.kleine-koenig, andy.gross, tklauser, david.brown,
rjui, s.hauer, slemieux.tyco, linuxppc-dev, vz, matthias.bgg,
andriy.shevchenko, baohua, sbranden, eric, richard.genoud, gregkh,
kernel, shawnguo
In-Reply-To: <1552602855-26086-1-git-send-email-info@metux.net>
Use the safer devm versions of memory mapping functions.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
drivers/tty/serial/pmac_zilog.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/tty/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c
index bcb5bf7..bce19b0 100644
--- a/drivers/tty/serial/pmac_zilog.c
+++ b/drivers/tty/serial/pmac_zilog.c
@@ -1411,7 +1411,7 @@ static int __init pmz_init_port(struct uart_pmac_port *uap)
if (of_address_to_resource(np, 0, &r_ports))
return -ENODEV;
uap->port.mapbase = r_ports.start;
- uap->port.membase = ioremap(uap->port.mapbase, 0x1000);
+ uap->port.membase = devm_ioremap(uap->port->dev, uap->port.mapbase, 0x1000);
uap->control_reg = uap->port.membase;
uap->data_reg = uap->control_reg + 0x10;
@@ -1428,14 +1428,16 @@ static int __init pmz_init_port(struct uart_pmac_port *uap)
memset(&r_rxdma, 0, sizeof(struct resource));
#endif
if (ZS_HAS_DMA(uap)) {
- uap->tx_dma_regs = ioremap(r_txdma.start, 0x100);
+ uap->tx_dma_regs = devm_ioremap(uap->port.dev,
+ r_txdma.start, 0x100);
if (uap->tx_dma_regs == NULL) {
uap->flags &= ~PMACZILOG_FLAG_HAS_DMA;
goto no_dma;
}
- uap->rx_dma_regs = ioremap(r_rxdma.start, 0x100);
+ uap->rx_dma_regs = devm_ioremap(uap->port.dev,
+ r_rxdma.start, 0x100);
if (uap->rx_dma_regs == NULL) {
- iounmap(uap->tx_dma_regs);
+ devm_iounmap(uap->port.dev, uap->tx_dma_regs);
uap->tx_dma_regs = NULL;
uap->flags &= ~PMACZILOG_FLAG_HAS_DMA;
goto no_dma;
@@ -1530,9 +1532,9 @@ static void pmz_dispose_port(struct uart_pmac_port *uap)
struct device_node *np;
np = uap->node;
- iounmap(uap->rx_dma_regs);
- iounmap(uap->tx_dma_regs);
- iounmap(uap->control_reg);
+ devm_iounmap(uap->port.dev, uap->rx_dma_regs);
+ devm_iounmap(uap->port.dev, uap->tx_dma_regs);
+ devm_iounmap(uap->port.dev, uap->control_reg);
uap->node = NULL;
of_node_put(np);
memset(uap, 0, sizeof(struct uart_pmac_port));
--
1.9.1
^ permalink raw reply related
* [PATCH v2 33/45] drivers: tty: serial: sb1250-duart: use dev_err() instead of printk()
From: Enrico Weigelt, metux IT consult @ 2019-03-14 22:34 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arm-msm, yamada.masahiro, macro, jacmet, festevam,
stefan.wahren, f.fainelli, bcm-kernel-feedback-list, linux-imx,
linux-serial, u.kleine-koenig, andy.gross, tklauser, david.brown,
rjui, s.hauer, slemieux.tyco, linuxppc-dev, vz, matthias.bgg,
andriy.shevchenko, baohua, sbranden, eric, richard.genoud, gregkh,
kernel, shawnguo
In-Reply-To: <1552602855-26086-1-git-send-email-info@metux.net>
Using dev_err() instead of printk() for more consistent output.
(prints device name, etc).
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
drivers/tty/serial/sb1250-duart.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/tty/serial/sb1250-duart.c b/drivers/tty/serial/sb1250-duart.c
index 329aced..655961c 100644
--- a/drivers/tty/serial/sb1250-duart.c
+++ b/drivers/tty/serial/sb1250-duart.c
@@ -663,7 +663,6 @@ static void sbd_release_port(struct uart_port *uport)
static int sbd_map_port(struct uart_port *uport)
{
- const char *err = KERN_ERR "sbd: Cannot map MMIO\n";
struct sbd_port *sport = to_sport(uport);
struct sbd_duart *duart = sport->duart;
@@ -671,7 +670,7 @@ static int sbd_map_port(struct uart_port *uport)
uport->membase = ioremap_nocache(uport->mapbase,
DUART_CHANREG_SPACING);
if (!uport->membase) {
- printk(err);
+ dev_err(uport->dev, "Cannot map MMIO (base)\n");
return -ENOMEM;
}
@@ -679,7 +678,7 @@ static int sbd_map_port(struct uart_port *uport)
sport->memctrl = ioremap_nocache(duart->mapctrl,
DUART_CHANREG_SPACING);
if (!sport->memctrl) {
- printk(err);
+ dev_err(uport->dev, "Cannot map MMIO (ctrl)\n");
iounmap(uport->membase);
uport->membase = NULL;
return -ENOMEM;
--
1.9.1
^ permalink raw reply related
* [PATCH v2 04/45] drivers: tty: serial: amba-pl010: use devm_ioremap_resource()
From: Enrico Weigelt, metux IT consult @ 2019-03-14 22:33 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arm-msm, yamada.masahiro, macro, jacmet, festevam,
stefan.wahren, f.fainelli, bcm-kernel-feedback-list, linux-imx,
linux-serial, u.kleine-koenig, andy.gross, tklauser, david.brown,
rjui, s.hauer, slemieux.tyco, linuxppc-dev, vz, matthias.bgg,
andriy.shevchenko, baohua, sbranden, eric, richard.genoud, gregkh,
kernel, shawnguo
In-Reply-To: <1552602855-26086-1-git-send-email-info@metux.net>
Instead of fetching out data from a struct resource for passing
it to devm_ioremap(), directly use devm_ioremap_resource()
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
drivers/tty/serial/amba-pl010.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/tty/serial/amba-pl010.c b/drivers/tty/serial/amba-pl010.c
index 2c37d11..109b8df 100644
--- a/drivers/tty/serial/amba-pl010.c
+++ b/drivers/tty/serial/amba-pl010.c
@@ -713,8 +713,7 @@ static int pl010_probe(struct amba_device *dev, const struct amba_id *id)
if (!uap)
return -ENOMEM;
- base = devm_ioremap(&dev->dev, dev->res.start,
- resource_size(&dev->res));
+ base = devm_ioremap_resource(&dev->dev, &dev->res);
if (!base)
return -ENOMEM;
--
1.9.1
^ permalink raw reply related
* [PATCH v2 11/45] drivers: tty: serial: zs: use dev_err() instead of printk()
From: Enrico Weigelt, metux IT consult @ 2019-03-14 22:33 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arm-msm, yamada.masahiro, macro, jacmet, festevam,
stefan.wahren, f.fainelli, bcm-kernel-feedback-list, linux-imx,
linux-serial, u.kleine-koenig, andy.gross, tklauser, david.brown,
rjui, s.hauer, slemieux.tyco, linuxppc-dev, vz, matthias.bgg,
andriy.shevchenko, baohua, sbranden, eric, richard.genoud, gregkh,
kernel, shawnguo
In-Reply-To: <1552602855-26086-1-git-send-email-info@metux.net>
Using dev_err() instead of printk() for more consistent output.
(prints device name, etc).
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
drivers/tty/serial/zs.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/tty/serial/zs.c b/drivers/tty/serial/zs.c
index 0b1ec2f..c3e23d4 100644
--- a/drivers/tty/serial/zs.c
+++ b/drivers/tty/serial/zs.c
@@ -767,7 +767,7 @@ static int zs_startup(struct uart_port *uport)
IRQF_SHARED, "scc", scc);
if (ret) {
atomic_add(-1, &scc->irq_guard);
- printk(KERN_ERR "zs: can't get irq %d\n",
+ dev_err(uport->dev, "zs: can't get irq %d\n",
zport->port.irq);
return ret;
}
@@ -996,7 +996,7 @@ static int zs_map_port(struct uart_port *uport)
uport->mapbase,
ZS_CHAN_IO_SIZE);
if (!uport->membase) {
- printk(KERN_ERR "zs: Cannot map MMIO\n");
+ dev_err(port->dev, "zs: Cannot map MMIO\n");
return -ENOMEM;
}
return 0;
@@ -1008,7 +1008,7 @@ static int zs_request_port(struct uart_port *uport)
if (!devm_request_mem_region(uport->mapbase,
ZS_CHAN_IO_SIZE, "scc")) {
- printk(KERN_ERR "zs: Unable to reserve MMIO resource\n");
+ dev_err(uport->dev, "zs: Unable to reserve MMIO resource\n");
return -EBUSY;
}
ret = zs_map_port(uport);
--
1.9.1
^ permalink raw reply related
* [PATCH v2 03/45] drivers: tty: serial: 8250_ingenic: use devm_ioremap_resource()
From: Enrico Weigelt, metux IT consult @ 2019-03-14 22:33 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arm-msm, yamada.masahiro, macro, jacmet, festevam,
stefan.wahren, f.fainelli, bcm-kernel-feedback-list, linux-imx,
linux-serial, u.kleine-koenig, andy.gross, tklauser, david.brown,
rjui, s.hauer, slemieux.tyco, linuxppc-dev, vz, matthias.bgg,
andriy.shevchenko, baohua, sbranden, eric, richard.genoud, gregkh,
kernel, shawnguo
In-Reply-To: <1552602855-26086-1-git-send-email-info@metux.net>
Instead of fetching out data from a struct resource for passing
it to devm_ioremap(), directly use devm_ioremap_resource()
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
drivers/tty/serial/8250/8250_ingenic.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_ingenic.c b/drivers/tty/serial/8250/8250_ingenic.c
index 424c07c..90ae3e2 100644
--- a/drivers/tty/serial/8250/8250_ingenic.c
+++ b/drivers/tty/serial/8250/8250_ingenic.c
@@ -249,8 +249,7 @@ static int ingenic_uart_probe(struct platform_device *pdev)
if (line >= 0)
uart.port.line = line;
- uart.port.membase = devm_ioremap(&pdev->dev, regs->start,
- resource_size(regs));
+ uart.port.membase = devm_ioremap_resource(&pdev->dev, regs);
if (!uart.port.membase)
return -ENOMEM;
--
1.9.1
^ permalink raw reply related
* [PATCH v2 08/45] drivers: tty: serial: 8250_lpc18xx: use devm_ioremap_resource()
From: Enrico Weigelt, metux IT consult @ 2019-03-14 22:33 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arm-msm, yamada.masahiro, macro, jacmet, festevam,
stefan.wahren, f.fainelli, bcm-kernel-feedback-list, linux-imx,
linux-serial, u.kleine-koenig, andy.gross, tklauser, david.brown,
rjui, s.hauer, slemieux.tyco, linuxppc-dev, vz, matthias.bgg,
andriy.shevchenko, baohua, sbranden, eric, richard.genoud, gregkh,
kernel, shawnguo
In-Reply-To: <1552602855-26086-1-git-send-email-info@metux.net>
Instead of fetching out data from a struct resource for passing
it to devm_ioremap(), directly use devm_ioremap_resource()
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
drivers/tty/serial/8250/8250_lpc18xx.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_lpc18xx.c b/drivers/tty/serial/8250/8250_lpc18xx.c
index eddf119..f36902b 100644
--- a/drivers/tty/serial/8250/8250_lpc18xx.c
+++ b/drivers/tty/serial/8250/8250_lpc18xx.c
@@ -119,8 +119,7 @@ static int lpc18xx_serial_probe(struct platform_device *pdev)
memset(&uart, 0, sizeof(uart));
- uart.port.membase = devm_ioremap(&pdev->dev, res->start,
- resource_size(res));
+ uart.port.membase = devm_ioremap_resource(&pdev->dev, res);
if (!uart.port.membase)
return -ENOMEM;
--
1.9.1
^ permalink raw reply related
* [PATCH v2 23/45] drivers: tty: serial: amba-pl010: use devm_* functions
From: Enrico Weigelt, metux IT consult @ 2019-03-14 22:33 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arm-msm, yamada.masahiro, macro, jacmet, festevam,
stefan.wahren, f.fainelli, bcm-kernel-feedback-list, linux-imx,
linux-serial, u.kleine-koenig, andy.gross, tklauser, david.brown,
rjui, s.hauer, slemieux.tyco, linuxppc-dev, vz, matthias.bgg,
andriy.shevchenko, baohua, sbranden, eric, richard.genoud, gregkh,
kernel, shawnguo
In-Reply-To: <1552602855-26086-1-git-send-email-info@metux.net>
Use the safer devm versions of memory mapping functions.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
drivers/tty/serial/amba-pl010.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/tty/serial/amba-pl010.c b/drivers/tty/serial/amba-pl010.c
index 109b8df..7abd1f8 100644
--- a/drivers/tty/serial/amba-pl010.c
+++ b/drivers/tty/serial/amba-pl010.c
@@ -503,7 +503,7 @@ static const char *pl010_type(struct uart_port *port)
*/
static void pl010_release_port(struct uart_port *port)
{
- release_mem_region(port->mapbase, UART_PORT_SIZE);
+ devm_release_mem_region(port->dev, port->mapbase, UART_PORT_SIZE);
}
/*
@@ -511,7 +511,10 @@ static void pl010_release_port(struct uart_port *port)
*/
static int pl010_request_port(struct uart_port *port)
{
- return request_mem_region(port->mapbase, UART_PORT_SIZE, "uart-pl010")
+ return devm_request_mem_region(port->dev,
+ port->mapbase,
+ UART_PORT_SIZE,
+ "uart-pl010")
!= NULL ? 0 : -EBUSY;
}
--
1.9.1
^ permalink raw reply related
* [PATCH v2 27/45] drivers: tty: serial: dz: use devm_* functions
From: Enrico Weigelt, metux IT consult @ 2019-03-14 22:33 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arm-msm, yamada.masahiro, macro, jacmet, festevam,
stefan.wahren, f.fainelli, bcm-kernel-feedback-list, linux-imx,
linux-serial, u.kleine-koenig, andy.gross, tklauser, david.brown,
rjui, s.hauer, slemieux.tyco, linuxppc-dev, vz, matthias.bgg,
andriy.shevchenko, baohua, sbranden, eric, richard.genoud, gregkh,
kernel, shawnguo
In-Reply-To: <1552602855-26086-1-git-send-email-info@metux.net>
Use the safer devm versions of memory mapping functions.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
drivers/tty/serial/dz.c | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/drivers/tty/serial/dz.c b/drivers/tty/serial/dz.c
index 96e35af..10a75e3 100644
--- a/drivers/tty/serial/dz.c
+++ b/drivers/tty/serial/dz.c
@@ -666,19 +666,22 @@ static void dz_release_port(struct uart_port *uport)
struct dz_mux *mux = to_dport(uport)->mux;
int map_guard;
- iounmap(uport->membase);
+ devm_iounmap(uport->dev, uport->membase);
uport->membase = NULL;
map_guard = atomic_add_return(-1, &mux->map_guard);
if (!map_guard)
- release_mem_region(uport->mapbase, dec_kn_slot_size);
+ devm_release_mem_region(uport->dev,
+ uport->mapbase,
+ dec_kn_slot_size);
}
static int dz_map_port(struct uart_port *uport)
{
if (!uport->membase)
- uport->membase = ioremap_nocache(uport->mapbase,
- dec_kn_slot_size);
+ uport->membase = devm_ioremap_nocache(uport->dev,
+ uport->mapbase,
+ dec_kn_slot_size);
if (!uport->membase) {
dev_err(uport->dev, "Cannot map MMIO\n");
return -ENOMEM;
@@ -694,8 +697,10 @@ static int dz_request_port(struct uart_port *uport)
map_guard = atomic_add_return(1, &mux->map_guard);
if (map_guard == 1) {
- if (!request_mem_region(uport->mapbase, dec_kn_slot_size,
- "dz")) {
+ if (!devm_request_mem_region(uport->dev,
+ uport->mapbase,
+ dec_kn_slot_size,
+ "dz")) {
atomic_add(-1, &mux->map_guard);
dev_err(uport->dev,
"Unable to reserve MMIO resource\n");
@@ -706,7 +711,9 @@ static int dz_request_port(struct uart_port *uport)
if (ret) {
map_guard = atomic_add_return(-1, &mux->map_guard);
if (!map_guard)
- release_mem_region(uport->mapbase, dec_kn_slot_size);
+ devm_release_mem_region(uport->dev,
+ uport->mapbase,
+ dec_kn_slot_size);
return ret;
}
return 0;
--
1.9.1
^ permalink raw reply related
* [PATCH v2 19/45] drivers: tty: serial: sh-sci: use devm_* functions
From: Enrico Weigelt, metux IT consult @ 2019-03-14 22:33 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arm-msm, yamada.masahiro, macro, jacmet, festevam,
stefan.wahren, f.fainelli, bcm-kernel-feedback-list, linux-imx,
linux-serial, u.kleine-koenig, andy.gross, tklauser, david.brown,
rjui, s.hauer, slemieux.tyco, linuxppc-dev, vz, matthias.bgg,
andriy.shevchenko, baohua, sbranden, eric, richard.genoud, gregkh,
kernel, shawnguo
In-Reply-To: <1552602855-26086-1-git-send-email-info@metux.net>
Use the safer devm versions of memory mapping functions.
Signed-off-by: Enrico Weigelt, metux IT consult <info@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
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox