]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Input: tegra-kbc - simplify use of devm_ioremap_resource
authorJulia Lawall <Julia.Lawall@lip6.fr>
Thu, 15 Aug 2013 07:07:43 +0000 (00:07 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 15 Aug 2013 07:30:12 +0000 (00:30 -0700)
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: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/keyboard/tegra-kbc.c

index b46142f78ef24fec15147c190880b01bffb458bd..9cd20e6905a08274bff3d55a48fa7e26d8f2b2c6 100644 (file)
@@ -638,12 +638,6 @@ static int tegra_kbc_probe(struct platform_device *pdev)
        if (!tegra_kbc_check_pin_cfg(kbc, &num_rows))
                return -EINVAL;
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!res) {
-               dev_err(&pdev->dev, "failed to get I/O memory\n");
-               return -ENXIO;
-       }
-
        kbc->irq = platform_get_irq(pdev, 0);
        if (kbc->irq < 0) {
                dev_err(&pdev->dev, "failed to get keyboard IRQ\n");
@@ -658,6 +652,7 @@ static int tegra_kbc_probe(struct platform_device *pdev)
 
        setup_timer(&kbc->timer, tegra_kbc_keypress_timer, (unsigned long)kbc);
 
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        kbc->mmio = devm_ioremap_resource(&pdev->dev, res);
        if (IS_ERR(kbc->mmio))
                return PTR_ERR(kbc->mmio);