diff options
| author | Julia Lawall <Julia.Lawall@lip6.fr> | 2013-08-19 13:20:36 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-19 17:12:21 -0700 |
| commit | 3abeff77c8e2d2ac494021a7ee12892b6136381c (patch) | |
| tree | 4c7501627a3359ecf2976450826a487570b70fa8 | |
| parent | 33acbb82695f84e9429c1f7fbdeb4588dea12ffa (diff) | |
| download | kernel-common-3abeff77c8e2d2ac494021a7ee12892b6136381c.tar.gz kernel-common-3abeff77c8e2d2ac494021a7ee12892b6136381c.tar.bz2 kernel-common-3abeff77c8e2d2ac494021a7ee12892b6136381c.zip | |
serial: st-asc: replace devm_request_and_ioremap by devm_ioremap_resource
Use devm_ioremap_resource instead of devm_request_and_ioremap.
This was done using the semantic patch
scripts/coccinelle/api/devm_ioremap_resource.cocci
and various manual modifications to move associated calls to
platform_get_resource closer to the resulting call to devm_ioremap_resource
and to remove the associated error handling code.
The initialization of port->mapbase is also moved lower, to take advantage
of the NULL test on res performed by devm_ioremap_resource.
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/tty/serial/st-asc.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/drivers/tty/serial/st-asc.c b/drivers/tty/serial/st-asc.c index 2ff4b1bb922d..4f5caa38e3dc 100644 --- a/drivers/tty/serial/st-asc.c +++ b/drivers/tty/serial/st-asc.c @@ -665,26 +665,20 @@ static int asc_init_port(struct asc_port *ascport, struct platform_device *pdev) { struct uart_port *port = &ascport->port; - struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - - if (!res) { - dev_err(&pdev->dev, "Unable to get io resource\n"); - return -ENODEV; - } + struct resource *res; port->iotype = UPIO_MEM; port->flags = UPF_BOOT_AUTOCONF; port->ops = &asc_uart_ops; port->fifosize = ASC_FIFO_SIZE; port->dev = &pdev->dev; - port->mapbase = res->start; port->irq = platform_get_irq(pdev, 0); - port->membase = devm_request_and_ioremap(&pdev->dev, res); - if (!port->membase) { - dev_err(&pdev->dev, "Unable to request io memory\n"); - return -ENODEV; - } + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + port->membase = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(port->membase)) + return PTR_ERR(port->membase); + port->mapbase = res->start; spin_lock_init(&port->lock); |