* [PATCH v2 32/45] drivers: tty: serial: atmel_serial: use devm_* functions
From: Enrico Weigelt, metux IT consult @ 2019-03-14 22:34 UTC (permalink / raw)
To: linux-kernel
Cc: gregkh, eric, stefan.wahren, f.fainelli, rjui, sbranden,
bcm-kernel-feedback-list, andriy.shevchenko, vz, matthias.bgg,
yamada.masahiro, tklauser, richard.genoud, macro, u.kleine-koenig,
kernel, slemieux.tyco, andy.gross, david.brown, shawnguo, s.hauer,
festevam, linux-imx, baohua, jacmet, linux-serial, linux-arm-msm,
linuxppc-dev
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/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
^ permalink raw reply related
* [PATCH v2 31/45] drivers: tty: serial: amba-pl011: use devm_* functions
From: Enrico Weigelt, metux IT consult @ 2019-03-14 22:34 UTC (permalink / raw)
To: linux-kernel
Cc: gregkh, eric, stefan.wahren, f.fainelli, rjui, sbranden,
bcm-kernel-feedback-list, andriy.shevchenko, vz, matthias.bgg,
yamada.masahiro, tklauser, richard.genoud, macro, u.kleine-koenig,
kernel, slemieux.tyco, andy.gross, david.brown, shawnguo, s.hauer,
festevam, linux-imx, baohua, jacmet, linux-serial, linux-arm-msm,
linuxppc-dev
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-pl011.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 89ade21..2a968b2 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -2098,7 +2098,7 @@ static const char *pl011_type(struct uart_port *port)
*/
static void pl011_release_port(struct uart_port *port)
{
- release_mem_region(port->mapbase, SZ_4K);
+ devm_release_mem_region(port->dev, port->mapbase, SZ_4K);
}
/*
@@ -2106,7 +2106,10 @@ static void pl011_release_port(struct uart_port *port)
*/
static int pl011_request_port(struct uart_port *port)
{
- return request_mem_region(port->mapbase, SZ_4K, "uart-pl011")
+ return devm_request_mem_region(port->dev,
+ port->mapbase,
+ SZ_4K,
+ "uart-pl011")
!= NULL ? 0 : -EBUSY;
}
--
1.9.1
^ permalink raw reply related
* [PATCH v2 30/45] drivers: tty: serial: serial_ks8695: use devm_* functions
From: Enrico Weigelt, metux IT consult @ 2019-03-14 22:34 UTC (permalink / raw)
To: linux-kernel
Cc: gregkh, eric, stefan.wahren, f.fainelli, rjui, sbranden,
bcm-kernel-feedback-list, andriy.shevchenko, vz, matthias.bgg,
yamada.masahiro, tklauser, richard.genoud, macro, u.kleine-koenig,
kernel, slemieux.tyco, andy.gross, david.brown, shawnguo, s.hauer,
festevam, linux-imx, baohua, jacmet, linux-serial, linux-arm-msm,
linuxppc-dev
In-Reply-To: <1552602855-26086-1-git-send-email-info@metux.net>
Use the safer devm versions of memory mapping functions.
---
drivers/tty/serial/serial_ks8695.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/tty/serial/serial_ks8695.c b/drivers/tty/serial/serial_ks8695.c
index b461d79..f901eea 100644
--- a/drivers/tty/serial/serial_ks8695.c
+++ b/drivers/tty/serial/serial_ks8695.c
@@ -482,7 +482,7 @@ static const char *ks8695uart_type(struct uart_port *port)
*/
static void ks8695uart_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);
}
/*
@@ -490,7 +490,9 @@ static void ks8695uart_release_port(struct uart_port *port)
*/
static int ks8695uart_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,
"serial_ks8695") != NULL ? 0 : -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: gregkh, eric, stefan.wahren, f.fainelli, rjui, sbranden,
bcm-kernel-feedback-list, andriy.shevchenko, vz, matthias.bgg,
yamada.masahiro, tklauser, richard.genoud, macro, u.kleine-koenig,
kernel, slemieux.tyco, andy.gross, david.brown, shawnguo, s.hauer,
festevam, linux-imx, baohua, jacmet, linux-serial, linux-arm-msm,
linuxppc-dev
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: gregkh, eric, stefan.wahren, f.fainelli, rjui, sbranden,
bcm-kernel-feedback-list, andriy.shevchenko, vz, matthias.bgg,
yamada.masahiro, tklauser, richard.genoud, macro, u.kleine-koenig,
kernel, slemieux.tyco, andy.gross, david.brown, shawnguo, s.hauer,
festevam, linux-imx, baohua, jacmet, linux-serial, linux-arm-msm,
linuxppc-dev
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 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: gregkh, eric, stefan.wahren, f.fainelli, rjui, sbranden,
bcm-kernel-feedback-list, andriy.shevchenko, vz, matthias.bgg,
yamada.masahiro, tklauser, richard.genoud, macro, u.kleine-koenig,
kernel, slemieux.tyco, andy.gross, david.brown, shawnguo, s.hauer,
festevam, linux-imx, baohua, jacmet, linux-serial, linux-arm-msm,
linuxppc-dev
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 26/45] drivers: tty: serial: dz: use dev_err() instead of printk()
From: Enrico Weigelt, metux IT consult @ 2019-03-14 22:33 UTC (permalink / raw)
To: linux-kernel
Cc: gregkh, eric, stefan.wahren, f.fainelli, rjui, sbranden,
bcm-kernel-feedback-list, andriy.shevchenko, vz, matthias.bgg,
yamada.masahiro, tklauser, richard.genoud, macro, u.kleine-koenig,
kernel, slemieux.tyco, andy.gross, david.brown, shawnguo, s.hauer,
festevam, linux-imx, baohua, jacmet, linux-serial, linux-arm-msm,
linuxppc-dev
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/dz.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/tty/serial/dz.c b/drivers/tty/serial/dz.c
index 7b57e84..96e35af 100644
--- a/drivers/tty/serial/dz.c
+++ b/drivers/tty/serial/dz.c
@@ -416,7 +416,7 @@ static int dz_startup(struct uart_port *uport)
IRQF_SHARED, "dz", mux);
if (ret) {
atomic_add(-1, &mux->irq_guard);
- printk(KERN_ERR "dz: Cannot get IRQ %d!\n", dport->port.irq);
+ dev_err(uport->dev, "Cannot get IRQ %d!\n", dport->port.irq);
return ret;
}
@@ -680,7 +680,7 @@ static int dz_map_port(struct uart_port *uport)
uport->membase = ioremap_nocache(uport->mapbase,
dec_kn_slot_size);
if (!uport->membase) {
- printk(KERN_ERR "dz: Cannot map MMIO\n");
+ dev_err(uport->dev, "Cannot map MMIO\n");
return -ENOMEM;
}
return 0;
@@ -697,8 +697,8 @@ static int dz_request_port(struct uart_port *uport)
if (!request_mem_region(uport->mapbase, dec_kn_slot_size,
"dz")) {
atomic_add(-1, &mux->map_guard);
- printk(KERN_ERR
- "dz: Unable to reserve MMIO resource\n");
+ dev_err(uport->dev,
+ "Unable to reserve MMIO resource\n");
return -EBUSY;
}
}
--
1.9.1
^ permalink raw reply related
* [PATCH v2 25/45] drivers: tty: serial: pxa: use devm_* functions
From: Enrico Weigelt, metux IT consult @ 2019-03-14 22:33 UTC (permalink / raw)
To: linux-kernel
Cc: gregkh, eric, stefan.wahren, f.fainelli, rjui, sbranden,
bcm-kernel-feedback-list, andriy.shevchenko, vz, matthias.bgg,
yamada.masahiro, tklauser, richard.genoud, macro, u.kleine-koenig,
kernel, slemieux.tyco, andy.gross, david.brown, shawnguo, s.hauer,
festevam, linux-imx, baohua, jacmet, linux-serial, linux-arm-msm,
linuxppc-dev
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/pxa.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/tty/serial/pxa.c b/drivers/tty/serial/pxa.c
index 4932b67..9512a9f 100644
--- a/drivers/tty/serial/pxa.c
+++ b/drivers/tty/serial/pxa.c
@@ -892,7 +892,7 @@ static int serial_pxa_probe(struct platform_device *dev)
}
snprintf(sport->name, PXA_NAME_LEN - 1, "UART%d", sport->port.line + 1);
- sport->port.membase = ioremap(mmres->start, resource_size(mmres));
+ sport->port.membase = devm_ioremap_resource(sport->port.dev, mmres);
if (!sport->port.membase) {
ret = -ENOMEM;
goto err_clk;
--
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: gregkh, eric, stefan.wahren, f.fainelli, rjui, sbranden,
bcm-kernel-feedback-list, andriy.shevchenko, vz, matthias.bgg,
yamada.masahiro, tklauser, richard.genoud, macro, u.kleine-koenig,
kernel, slemieux.tyco, andy.gross, david.brown, shawnguo, s.hauer,
festevam, linux-imx, baohua, jacmet, linux-serial, linux-arm-msm,
linuxppc-dev
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 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: gregkh, eric, stefan.wahren, f.fainelli, rjui, sbranden,
bcm-kernel-feedback-list, andriy.shevchenko, vz, matthias.bgg,
yamada.masahiro, tklauser, richard.genoud, macro, u.kleine-koenig,
kernel, slemieux.tyco, andy.gross, david.brown, shawnguo, s.hauer,
festevam, linux-imx, baohua, jacmet, linux-serial, linux-arm-msm,
linuxppc-dev
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 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: gregkh, eric, stefan.wahren, f.fainelli, rjui, sbranden,
bcm-kernel-feedback-list, andriy.shevchenko, vz, matthias.bgg,
yamada.masahiro, tklauser, richard.genoud, macro, u.kleine-koenig,
kernel, slemieux.tyco, andy.gross, david.brown, shawnguo, s.hauer,
festevam, linux-imx, baohua, jacmet, linux-serial, linux-arm-msm,
linuxppc-dev
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 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: gregkh, eric, stefan.wahren, f.fainelli, rjui, sbranden,
bcm-kernel-feedback-list, andriy.shevchenko, vz, matthias.bgg,
yamada.masahiro, tklauser, richard.genoud, macro, u.kleine-koenig,
kernel, slemieux.tyco, andy.gross, david.brown, shawnguo, s.hauer,
festevam, linux-imx, baohua, jacmet, linux-serial, linux-arm-msm,
linuxppc-dev
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 20/45] drivers: tty: serial: msm_serial: use devm_* functions
From: Enrico Weigelt, metux IT consult @ 2019-03-14 22:33 UTC (permalink / raw)
To: linux-kernel
Cc: gregkh, eric, stefan.wahren, f.fainelli, rjui, sbranden,
bcm-kernel-feedback-list, andriy.shevchenko, vz, matthias.bgg,
yamada.masahiro, tklauser, richard.genoud, macro, u.kleine-koenig,
kernel, slemieux.tyco, andy.gross, david.brown, shawnguo, s.hauer,
festevam, linux-imx, baohua, jacmet, linux-serial, linux-arm-msm,
linuxppc-dev
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/msm_serial.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
index 1090960..e8e0c87 100644
--- a/drivers/tty/serial/msm_serial.c
+++ b/drivers/tty/serial/msm_serial.c
@@ -1324,8 +1324,8 @@ static void msm_release_port(struct uart_port *port)
return;
size = resource_size(uart_resource);
- release_mem_region(port->mapbase, size);
- iounmap(port->membase);
+ devm_release_mem_region(port->dev, port->mapbase, size);
+ devm_iounmap(port->dev, port->membase);
port->membase = NULL;
}
@@ -1342,10 +1342,13 @@ static int msm_request_port(struct uart_port *port)
size = resource_size(uart_resource);
- if (!request_mem_region(port->mapbase, size, "msm_serial"))
+ if (!devm_request_mem_region(port->dev,
+ port->mapbase,
+ size,
+ "msm_serial"))
return -EBUSY;
- port->membase = ioremap(port->mapbase, size);
+ port->membase = ioremap(port->dev, port->mapbase, size);
if (!port->membase) {
ret = -EBUSY;
goto fail_release_port;
@@ -1354,7 +1357,7 @@ static int msm_request_port(struct uart_port *port)
return 0;
fail_release_port:
- release_mem_region(port->mapbase, size);
+ devm_release_mem_region(port->dev, port->mapbase, size);
return ret;
}
--
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: gregkh, eric, stefan.wahren, f.fainelli, rjui, sbranden,
bcm-kernel-feedback-list, andriy.shevchenko, vz, matthias.bgg,
yamada.masahiro, tklauser, richard.genoud, macro, u.kleine-koenig,
kernel, slemieux.tyco, andy.gross, david.brown, shawnguo, s.hauer,
festevam, linux-imx, baohua, jacmet, linux-serial, linux-arm-msm,
linuxppc-dev
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
* [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: gregkh, eric, stefan.wahren, f.fainelli, rjui, sbranden,
bcm-kernel-feedback-list, andriy.shevchenko, vz, matthias.bgg,
yamada.masahiro, tklauser, richard.genoud, macro, u.kleine-koenig,
kernel, slemieux.tyco, andy.gross, david.brown, shawnguo, s.hauer,
festevam, linux-imx, baohua, jacmet, linux-serial, linux-arm-msm,
linuxppc-dev
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 17/45] drivers: tty: serial: timuart: use devm_* functions
From: Enrico Weigelt, metux IT consult @ 2019-03-14 22:33 UTC (permalink / raw)
To: linux-kernel
Cc: gregkh, eric, stefan.wahren, f.fainelli, rjui, sbranden,
bcm-kernel-feedback-list, andriy.shevchenko, vz, matthias.bgg,
yamada.masahiro, tklauser, richard.genoud, macro, u.kleine-koenig,
kernel, slemieux.tyco, andy.gross, david.brown, shawnguo, s.hauer,
festevam, linux-imx, baohua, jacmet, linux-serial, linux-arm-msm,
linuxppc-dev
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/timbuart.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/tty/serial/timbuart.c b/drivers/tty/serial/timbuart.c
index 19d38b5..292354b 100644
--- a/drivers/tty/serial/timbuart.c
+++ b/drivers/tty/serial/timbuart.c
@@ -319,11 +319,11 @@ static void timbuart_release_port(struct uart_port *port)
resource_size(platform_get_resource(pdev, IORESOURCE_MEM, 0));
if (port->flags & UPF_IOREMAP) {
- iounmap(port->membase);
+ devm_iounmap(port->dev, port->membase);
port->membase = NULL;
}
- release_mem_region(port->mapbase, size);
+ devm_release_mem_region(port->dev, port->mapbase, size);
}
static int timbuart_request_port(struct uart_port *port)
@@ -332,13 +332,18 @@ static int timbuart_request_port(struct uart_port *port)
int size =
resource_size(platform_get_resource(pdev, IORESOURCE_MEM, 0));
- if (!request_mem_region(port->mapbase, size, "timb-uart"))
+ if (!devm_request_mem_region(port->dev,
+ port->mapbase,
+ size,
+ "timb-uart"))
return -EBUSY;
if (port->flags & UPF_IOREMAP) {
port->membase = ioremap(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
^ 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: gregkh, eric, stefan.wahren, f.fainelli, rjui, sbranden,
bcm-kernel-feedback-list, andriy.shevchenko, vz, matthias.bgg,
yamada.masahiro, tklauser, richard.genoud, macro, u.kleine-koenig,
kernel, slemieux.tyco, andy.gross, david.brown, shawnguo, s.hauer,
festevam, linux-imx, baohua, jacmet, linux-serial, linux-arm-msm,
linuxppc-dev
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 15/45] drivers: tty: serial: uartlite: use dev_err() instead of printk()
From: Enrico Weigelt, metux IT consult @ 2019-03-14 22:33 UTC (permalink / raw)
To: linux-kernel
Cc: gregkh, eric, stefan.wahren, f.fainelli, rjui, sbranden,
bcm-kernel-feedback-list, andriy.shevchenko, vz, matthias.bgg,
yamada.masahiro, tklauser, richard.genoud, macro, u.kleine-koenig,
kernel, slemieux.tyco, andy.gross, david.brown, shawnguo, s.hauer,
festevam, linux-imx, baohua, jacmet, linux-serial, linux-arm-msm,
linuxppc-dev
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/uartlite.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/tty/serial/uartlite.c b/drivers/tty/serial/uartlite.c
index b8b912b..aa461b8 100644
--- a/drivers/tty/serial/uartlite.c
+++ b/drivers/tty/serial/uartlite.c
@@ -352,7 +352,7 @@ static int ulite_request_port(struct uart_port *port)
struct uartlite_data *pdata = port->private_data;
int ret;
- pr_debug("ulite console: port=%p; port->mapbase=%llx\n",
+ 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")) {
@@ -519,7 +519,7 @@ static int ulite_console_setup(struct console *co, char *options)
/* Has the device been initialized yet? */
if (!port->mapbase) {
- pr_debug("console on ttyUL%i not present\n", co->index);
+ dev_dbg(port->dev, "console on ttyUL%i not present\n", co->index);
return -ENODEV;
}
--
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: gregkh, eric, stefan.wahren, f.fainelli, rjui, sbranden,
bcm-kernel-feedback-list, andriy.shevchenko, vz, matthias.bgg,
yamada.masahiro, tklauser, richard.genoud, macro, u.kleine-koenig,
kernel, slemieux.tyco, andy.gross, david.brown, shawnguo, s.hauer,
festevam, linux-imx, baohua, jacmet, linux-serial, linux-arm-msm,
linuxppc-dev
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 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: gregkh, eric, stefan.wahren, f.fainelli, rjui, sbranden,
bcm-kernel-feedback-list, andriy.shevchenko, vz, matthias.bgg,
yamada.masahiro, tklauser, richard.genoud, macro, u.kleine-koenig,
kernel, slemieux.tyco, andy.gross, david.brown, shawnguo, s.hauer,
festevam, linux-imx, baohua, jacmet, linux-serial, linux-arm-msm,
linuxppc-dev
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 12/45] drivers: tty: serial: xilinx_uartps: use devm_* functions
From: Enrico Weigelt, metux IT consult @ 2019-03-14 22:33 UTC (permalink / raw)
To: linux-kernel
Cc: gregkh, eric, stefan.wahren, f.fainelli, rjui, sbranden,
bcm-kernel-feedback-list, andriy.shevchenko, vz, matthias.bgg,
yamada.masahiro, tklauser, richard.genoud, macro, u.kleine-koenig,
kernel, slemieux.tyco, andy.gross, david.brown, shawnguo, s.hauer,
festevam, linux-imx, baohua, jacmet, linux-serial, linux-arm-msm,
linuxppc-dev
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/xilinx_uartps.c | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
index 74089f5..6684ed7 100644
--- a/drivers/tty/serial/xilinx_uartps.c
+++ b/drivers/tty/serial/xilinx_uartps.c
@@ -953,15 +953,21 @@ static int cdns_uart_verify_port(struct uart_port *port,
*/
static int cdns_uart_request_port(struct uart_port *port)
{
- if (!request_mem_region(port->mapbase, CDNS_UART_REGISTER_SPACE,
- CDNS_UART_NAME)) {
+ if (!devm_request_mem_region(port->dev,
+ port->mapbase,
+ CDNS_UART_REGISTER_SPACE,
+ CDNS_UART_NAME)) {
return -ENOMEM;
}
- port->membase = ioremap(port->mapbase, CDNS_UART_REGISTER_SPACE);
+ port->membase = devm_ioremap(port->dev,
+ port->mapbase,
+ CDNS_UART_REGISTER_SPACE);
if (!port->membase) {
dev_err(port->dev, "Unable to map registers\n");
- release_mem_region(port->mapbase, CDNS_UART_REGISTER_SPACE);
+ devm_release_mem_region(port->dev,
+ port->mapbase,
+ CDNS_UART_REGISTER_SPACE);
return -ENOMEM;
}
return 0;
@@ -976,8 +982,10 @@ static int cdns_uart_request_port(struct uart_port *port)
*/
static void cdns_uart_release_port(struct uart_port *port)
{
- release_mem_region(port->mapbase, CDNS_UART_REGISTER_SPACE);
- iounmap(port->membase);
+ devm_release_mem_region(port->dev,
+ port->mapbase,
+ CDNS_UART_REGISTER_SPACE);
+ devm_iounmap(port->dev, port->membase);
port->membase = NULL;
}
--
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: gregkh, eric, stefan.wahren, f.fainelli, rjui, sbranden,
bcm-kernel-feedback-list, andriy.shevchenko, vz, matthias.bgg,
yamada.masahiro, tklauser, richard.genoud, macro, u.kleine-koenig,
kernel, slemieux.tyco, andy.gross, david.brown, shawnguo, s.hauer,
festevam, linux-imx, baohua, jacmet, linux-serial, linux-arm-msm,
linuxppc-dev
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 10/45] drivers: tty: serial: zs: use devm_* functions
From: Enrico Weigelt, metux IT consult @ 2019-03-14 22:33 UTC (permalink / raw)
To: linux-kernel
Cc: gregkh, eric, stefan.wahren, f.fainelli, rjui, sbranden,
bcm-kernel-feedback-list, andriy.shevchenko, vz, matthias.bgg,
yamada.masahiro, tklauser, richard.genoud, macro, u.kleine-koenig,
kernel, slemieux.tyco, andy.gross, david.brown, shawnguo, s.hauer,
festevam, linux-imx, baohua, jacmet, linux-serial, linux-arm-msm,
linuxppc-dev
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/zs.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/drivers/tty/serial/zs.c b/drivers/tty/serial/zs.c
index b03d3e4..0b1ec2f 100644
--- a/drivers/tty/serial/zs.c
+++ b/drivers/tty/serial/zs.c
@@ -984,16 +984,17 @@ static const char *zs_type(struct uart_port *uport)
static void zs_release_port(struct uart_port *uport)
{
- iounmap(uport->membase);
+ devm_iounmap(uport->dev, uport->membase);
uport->membase = 0;
- release_mem_region(uport->mapbase, ZS_CHAN_IO_SIZE);
+ devm_release_mem_region(uport->dev, uport->mapbase, ZS_CHAN_IO_SIZE);
}
static int zs_map_port(struct uart_port *uport)
{
if (!uport->membase)
- uport->membase = ioremap_nocache(uport->mapbase,
- ZS_CHAN_IO_SIZE);
+ uport->membase = devm_ioremap_nocache(uport->dev,
+ uport->mapbase,
+ ZS_CHAN_IO_SIZE);
if (!uport->membase) {
printk(KERN_ERR "zs: Cannot map MMIO\n");
return -ENOMEM;
@@ -1005,13 +1006,16 @@ static int zs_request_port(struct uart_port *uport)
{
int ret;
- if (!request_mem_region(uport->mapbase, ZS_CHAN_IO_SIZE, "scc")) {
+ if (!devm_request_mem_region(uport->mapbase,
+ ZS_CHAN_IO_SIZE, "scc")) {
printk(KERN_ERR "zs: Unable to reserve MMIO resource\n");
return -EBUSY;
}
ret = zs_map_port(uport);
if (ret) {
- release_mem_region(uport->mapbase, ZS_CHAN_IO_SIZE);
+ devm_release_mem_region(uport-dev,
+ uport->mapbase,
+ ZS_CHAN_IO_SIZE);
return ret;
}
return 0;
--
1.9.1
^ permalink raw reply related
* [PATCH v2 09/45] drivers: tty: serial: 8250_mtk: use devm_ioremap_resource()
From: Enrico Weigelt, metux IT consult @ 2019-03-14 22:33 UTC (permalink / raw)
To: linux-kernel
Cc: gregkh, eric, stefan.wahren, f.fainelli, rjui, sbranden,
bcm-kernel-feedback-list, andriy.shevchenko, vz, matthias.bgg,
yamada.masahiro, tklauser, richard.genoud, macro, u.kleine-koenig,
kernel, slemieux.tyco, andy.gross, david.brown, shawnguo, s.hauer,
festevam, linux-imx, baohua, jacmet, linux-serial, linux-arm-msm,
linuxppc-dev
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_mtk.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_mtk.c b/drivers/tty/serial/8250/8250_mtk.c
index c1fdbc0..bf6eb8d 100644
--- a/drivers/tty/serial/8250/8250_mtk.c
+++ b/drivers/tty/serial/8250/8250_mtk.c
@@ -383,8 +383,7 @@ static int mtk8250_probe(struct platform_device *pdev)
return -EINVAL;
}
- 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: gregkh, eric, stefan.wahren, f.fainelli, rjui, sbranden,
bcm-kernel-feedback-list, andriy.shevchenko, vz, matthias.bgg,
yamada.masahiro, tklauser, richard.genoud, macro, u.kleine-koenig,
kernel, slemieux.tyco, andy.gross, david.brown, shawnguo, s.hauer,
festevam, linux-imx, baohua, jacmet, linux-serial, linux-arm-msm,
linuxppc-dev
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
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