aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial/ar933x_uart.c
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2013-08-14 05:11:22 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-08-14 15:06:13 -0400
commit071eb0ff68f5898af724752b3527edcddf222e23 (patch)
tree22155746e9f24a005fbe37ea84e9e615a3d9b96f /drivers/tty/serial/ar933x_uart.c
parentb83286bfa8f40cd7545d772e2fb2a94fe8bb5830 (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/tty/serial/ar933x_uart.c')
-rw-r--r--drivers/tty/serial/ar933x_uart.c7
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)
640 if (id > CONFIG_SERIAL_AR933X_NR_UARTS) 640 if (id > CONFIG_SERIAL_AR933X_NR_UARTS)
641 return -EINVAL; 641 return -EINVAL;
642 642
643 mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
644 if (!mem_res) {
645 dev_err(&pdev->dev, "no MEM resource\n");
646 return -EINVAL;
647 }
648
649 irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); 643 irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
650 if (!irq_res) { 644 if (!irq_res) {
651 dev_err(&pdev->dev, "no IRQ resource\n"); 645 dev_err(&pdev->dev, "no IRQ resource\n");
@@ -659,6 +653,7 @@ static int ar933x_uart_probe(struct platform_device *pdev)
659 653
660 port = &up->port; 654 port = &up->port;
661 655
656 mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
662 port->membase = devm_ioremap_resource(&pdev->dev, mem_res); 657 port->membase = devm_ioremap_resource(&pdev->dev, mem_res);
663 if (IS_ERR(port->membase)) 658 if (IS_ERR(port->membase))
664 return PTR_ERR(port->membase); 659 return PTR_ERR(port->membase);