diff options
author | Julia Lawall <Julia.Lawall@lip6.fr> | 2013-08-15 03:07:43 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-08-15 03:30:12 -0400 |
commit | eacd0c47966b918f10c7ac1a91dd9fccb0f58ddd (patch) | |
tree | d8585b4a31188925cf2045d843045970e1ea17fc | |
parent | f01868dcb13e7eb064910e8afe391c1846b9e73b (diff) |
Input: tegra-kbc - 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: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r-- | drivers/input/keyboard/tegra-kbc.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/input/keyboard/tegra-kbc.c b/drivers/input/keyboard/tegra-kbc.c index b46142f78ef2..9cd20e6905a0 100644 --- a/drivers/input/keyboard/tegra-kbc.c +++ b/drivers/input/keyboard/tegra-kbc.c | |||
@@ -638,12 +638,6 @@ static int tegra_kbc_probe(struct platform_device *pdev) | |||
638 | if (!tegra_kbc_check_pin_cfg(kbc, &num_rows)) | 638 | if (!tegra_kbc_check_pin_cfg(kbc, &num_rows)) |
639 | return -EINVAL; | 639 | return -EINVAL; |
640 | 640 | ||
641 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
642 | if (!res) { | ||
643 | dev_err(&pdev->dev, "failed to get I/O memory\n"); | ||
644 | return -ENXIO; | ||
645 | } | ||
646 | |||
647 | kbc->irq = platform_get_irq(pdev, 0); | 641 | kbc->irq = platform_get_irq(pdev, 0); |
648 | if (kbc->irq < 0) { | 642 | if (kbc->irq < 0) { |
649 | dev_err(&pdev->dev, "failed to get keyboard IRQ\n"); | 643 | dev_err(&pdev->dev, "failed to get keyboard IRQ\n"); |
@@ -658,6 +652,7 @@ static int tegra_kbc_probe(struct platform_device *pdev) | |||
658 | 652 | ||
659 | setup_timer(&kbc->timer, tegra_kbc_keypress_timer, (unsigned long)kbc); | 653 | setup_timer(&kbc->timer, tegra_kbc_keypress_timer, (unsigned long)kbc); |
660 | 654 | ||
655 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
661 | kbc->mmio = devm_ioremap_resource(&pdev->dev, res); | 656 | kbc->mmio = devm_ioremap_resource(&pdev->dev, res); |
662 | if (IS_ERR(kbc->mmio)) | 657 | if (IS_ERR(kbc->mmio)) |
663 | return PTR_ERR(kbc->mmio); | 658 | return PTR_ERR(kbc->mmio); |