diff options
author | Julia Lawall <Julia.Lawall@lip6.fr> | 2013-08-14 05:11:16 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-08-14 14:14:36 -0400 |
commit | 64efc5a0f272b370e5ae6e95ff3cd5023ce9fefc (patch) | |
tree | c02947b1632c3000a870e0ed1e237d2f6f53b092 /sound/soc/samsung/ac97.c | |
parent | c7f7e607513f6e8bc41d92e86c5989228b3bcbe8 (diff) |
ASoC: samsung-ac97: 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: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/samsung/ac97.c')
-rw-r--r-- | sound/soc/samsung/ac97.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sound/soc/samsung/ac97.c b/sound/soc/samsung/ac97.c index 2dd623fa3882..c732df9a35b6 100644 --- a/sound/soc/samsung/ac97.c +++ b/sound/soc/samsung/ac97.c | |||
@@ -404,18 +404,13 @@ static int s3c_ac97_probe(struct platform_device *pdev) | |||
404 | return -ENXIO; | 404 | return -ENXIO; |
405 | } | 405 | } |
406 | 406 | ||
407 | mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
408 | if (!mem_res) { | ||
409 | dev_err(&pdev->dev, "Unable to get register resource\n"); | ||
410 | return -ENXIO; | ||
411 | } | ||
412 | |||
413 | irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); | 407 | irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); |
414 | if (!irq_res) { | 408 | if (!irq_res) { |
415 | dev_err(&pdev->dev, "AC97 IRQ not provided!\n"); | 409 | dev_err(&pdev->dev, "AC97 IRQ not provided!\n"); |
416 | return -ENXIO; | 410 | return -ENXIO; |
417 | } | 411 | } |
418 | 412 | ||
413 | mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
419 | s3c_ac97.regs = devm_ioremap_resource(&pdev->dev, mem_res); | 414 | s3c_ac97.regs = devm_ioremap_resource(&pdev->dev, mem_res); |
420 | if (IS_ERR(s3c_ac97.regs)) | 415 | if (IS_ERR(s3c_ac97.regs)) |
421 | return PTR_ERR(s3c_ac97.regs); | 416 | return PTR_ERR(s3c_ac97.regs); |