diff options
author | Sachin Kamat <sachin.kamat@linaro.org> | 2013-03-04 03:54:39 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-15 16:55:23 -0400 |
commit | 82b231323e419dcd61de9ff38d66dd7e82564594 (patch) | |
tree | f9cdd854f679c5875acec04e785cf610430cd649 /drivers | |
parent | 84e819220468e989a0dde33bf1121888c5e749b1 (diff) |
serial: vt8500_serial: Convert to devm_ioremap_resource()
Use the newly introduced devm_ioremap_resource() instead of
devm_request_and_ioremap() which provides more consistent error handling.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Tony Prisk <linux@prisktech.co.nz>
Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/tty/serial/vt8500_serial.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/tty/serial/vt8500_serial.c b/drivers/tty/serial/vt8500_serial.c index a3f9dd5c9dff..f15f53f18ca9 100644 --- a/drivers/tty/serial/vt8500_serial.c +++ b/drivers/tty/serial/vt8500_serial.c | |||
@@ -35,6 +35,7 @@ | |||
35 | #include <linux/clk.h> | 35 | #include <linux/clk.h> |
36 | #include <linux/platform_device.h> | 36 | #include <linux/platform_device.h> |
37 | #include <linux/of.h> | 37 | #include <linux/of.h> |
38 | #include <linux/err.h> | ||
38 | 39 | ||
39 | /* | 40 | /* |
40 | * UART Register offsets | 41 | * UART Register offsets |
@@ -585,9 +586,9 @@ static int vt8500_serial_probe(struct platform_device *pdev) | |||
585 | if (!vt8500_port) | 586 | if (!vt8500_port) |
586 | return -ENOMEM; | 587 | return -ENOMEM; |
587 | 588 | ||
588 | vt8500_port->uart.membase = devm_request_and_ioremap(&pdev->dev, mmres); | 589 | vt8500_port->uart.membase = devm_ioremap_resource(&pdev->dev, mmres); |
589 | if (!vt8500_port->uart.membase) | 590 | if (IS_ERR(vt8500_port->uart.membase)) |
590 | return -EADDRNOTAVAIL; | 591 | return PTR_ERR(vt8500_port->uart.membase); |
591 | 592 | ||
592 | vt8500_port->clk = of_clk_get(pdev->dev.of_node, 0); | 593 | vt8500_port->clk = of_clk_get(pdev->dev.of_node, 0); |
593 | if (IS_ERR(vt8500_port->clk)) { | 594 | if (IS_ERR(vt8500_port->clk)) { |