diff options
| author | Julia Lawall <Julia.Lawall@lip6.fr> | 2013-08-15 00:08:17 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-08-15 00:30:17 -0700 |
| commit | ef0aca7f2f94a24d82aea0b74ae7a71c611e4895 (patch) | |
| tree | 4079e6de6f11c7774cd652d98508207ff0f59990 /drivers/input/serio | |
| parent | eacd0c47966b918f10c7ac1a91dd9fccb0f58ddd (diff) | |
| download | op-kernel-dev-ef0aca7f2f94a24d82aea0b74ae7a71c611e4895.zip op-kernel-dev-ef0aca7f2f94a24d82aea0b74ae7a71c611e4895.tar.gz | |
Input: keyboard, serio - 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>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/serio')
| -rw-r--r-- | drivers/input/serio/arc_ps2.c | 7 | ||||
| -rw-r--r-- | drivers/input/serio/olpc_apsp.c | 3 |
2 files changed, 1 insertions, 9 deletions
diff --git a/drivers/input/serio/arc_ps2.c b/drivers/input/serio/arc_ps2.c index 3fb7727..8024a6d 100644 --- a/drivers/input/serio/arc_ps2.c +++ b/drivers/input/serio/arc_ps2.c @@ -189,12 +189,6 @@ static int arc_ps2_probe(struct platform_device *pdev) int irq; int error, id, i; - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) { - dev_err(&pdev->dev, "no IO memory defined\n"); - return -EINVAL; - } - irq = platform_get_irq_byname(pdev, "arc_ps2_irq"); if (irq < 0) { dev_err(&pdev->dev, "no IRQ defined\n"); @@ -208,6 +202,7 @@ static int arc_ps2_probe(struct platform_device *pdev) return -ENOMEM; } + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); arc_ps2->addr = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(arc_ps2->addr)) return PTR_ERR(arc_ps2->addr); diff --git a/drivers/input/serio/olpc_apsp.c b/drivers/input/serio/olpc_apsp.c index 818aa46..51b1d40 100644 --- a/drivers/input/serio/olpc_apsp.c +++ b/drivers/input/serio/olpc_apsp.c @@ -183,9 +183,6 @@ static int olpc_apsp_probe(struct platform_device *pdev) np = pdev->dev.of_node; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) - return -ENOENT; - priv->base = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(priv->base)) { dev_err(&pdev->dev, "Failed to map WTM registers\n"); |
