diff options
author | Julia Lawall <Julia.Lawall@lip6.fr> | 2013-08-15 03:08:17 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-08-15 03:30:17 -0400 |
commit | ef0aca7f2f94a24d82aea0b74ae7a71c611e4895 (patch) | |
tree | 4079e6de6f11c7774cd652d98508207ff0f59990 /drivers/input/serio | |
parent | eacd0c47966b918f10c7ac1a91dd9fccb0f58ddd (diff) |
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 3fb7727c8ea5..8024a6d7fccb 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) | |||
189 | int irq; | 189 | int irq; |
190 | int error, id, i; | 190 | int error, id, i; |
191 | 191 | ||
192 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
193 | if (!res) { | ||
194 | dev_err(&pdev->dev, "no IO memory defined\n"); | ||
195 | return -EINVAL; | ||
196 | } | ||
197 | |||
198 | irq = platform_get_irq_byname(pdev, "arc_ps2_irq"); | 192 | irq = platform_get_irq_byname(pdev, "arc_ps2_irq"); |
199 | if (irq < 0) { | 193 | if (irq < 0) { |
200 | dev_err(&pdev->dev, "no IRQ defined\n"); | 194 | dev_err(&pdev->dev, "no IRQ defined\n"); |
@@ -208,6 +202,7 @@ static int arc_ps2_probe(struct platform_device *pdev) | |||
208 | return -ENOMEM; | 202 | return -ENOMEM; |
209 | } | 203 | } |
210 | 204 | ||
205 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
211 | arc_ps2->addr = devm_ioremap_resource(&pdev->dev, res); | 206 | arc_ps2->addr = devm_ioremap_resource(&pdev->dev, res); |
212 | if (IS_ERR(arc_ps2->addr)) | 207 | if (IS_ERR(arc_ps2->addr)) |
213 | return PTR_ERR(arc_ps2->addr); | 208 | return PTR_ERR(arc_ps2->addr); |
diff --git a/drivers/input/serio/olpc_apsp.c b/drivers/input/serio/olpc_apsp.c index 818aa466b5d2..51b1d40cc286 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) | |||
183 | 183 | ||
184 | np = pdev->dev.of_node; | 184 | np = pdev->dev.of_node; |
185 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 185 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
186 | if (!res) | ||
187 | return -ENOENT; | ||
188 | |||
189 | priv->base = devm_ioremap_resource(&pdev->dev, res); | 186 | priv->base = devm_ioremap_resource(&pdev->dev, res); |
190 | if (IS_ERR(priv->base)) { | 187 | if (IS_ERR(priv->base)) { |
191 | dev_err(&pdev->dev, "Failed to map WTM registers\n"); | 188 | dev_err(&pdev->dev, "Failed to map WTM registers\n"); |