diff options
| author | Julia Lawall | 2013-08-14 11:11:22 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-08-14 12:06:13 -0700 |
| commit | 071eb0ff68f5898af724752b3527edcddf222e23 (patch) | |
| tree | 22155746e9f24a005fbe37ea84e9e615a3d9b96f /drivers | |
| parent | b83286bfa8f40cd7545d772e2fb2a94fe8bb5830 (diff) | |
tty: ar933x_uart: simplify use of devm_ioremap_resource
Remove unneeded error handling on the result of a call to
platform_get_resource when the value is passed to devm_ioremap_resource.
Move the call to platform_get_resource adjacent to the call to
devm_ioremap_resource to make the connection between them more clear.
A simplified version of the semantic patch that makes this change is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@@
expression pdev,res,n,e,e1;
expression ret != 0;
identifier l;
@@
- res = platform_get_resource(pdev, IORESOURCE_MEM, n);
... when != res
- if (res == NULL) { ... \(goto l;\|return ret;\) }
... when != res
+ res = platform_get_resource(pdev, IORESOURCE_MEM, n);
e = devm_ioremap_resource(e1, res);
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/tty/serial/ar933x_uart.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/tty/serial/ar933x_uart.c b/drivers/tty/serial/ar933x_uart.c index 3f5517f8a58b..a712a3fabd44 100644 --- a/drivers/tty/serial/ar933x_uart.c +++ b/drivers/tty/serial/ar933x_uart.c @@ -640,12 +640,6 @@ static int ar933x_uart_probe(struct platform_device *pdev) if (id > CONFIG_SERIAL_AR933X_NR_UARTS) return -EINVAL; - mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!mem_res) { - dev_err(&pdev->dev, "no MEM resource\n"); - return -EINVAL; - } - irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); if (!irq_res) { dev_err(&pdev->dev, "no IRQ resource\n"); @@ -659,6 +653,7 @@ static int ar933x_uart_probe(struct platform_device *pdev) port = &up->port; + mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); port->membase = devm_ioremap_resource(&pdev->dev, mem_res); if (IS_ERR(port->membase)) return PTR_ERR(port->membase); |