ASoC: omap: simplify platform_get_resource_byname/devm_ioremap_resource

Remove unneeded error handling on the result of a call to
platform_get_resource_byname when the value is passed to devm_ioremap_resource.

In the case of omap-dmic.c, the error-handling code of
devm_ioremap_resource is also corrected to include releasing the clock.

A simplified version of the semantic patch that makes this change is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@@
expression pdev,res,e,e1;
expression ret != 0;
identifier l;
@@

  res = platform_get_resource_byname(...);
- if (res == NULL) { ... \(goto l;\|return ret;\) }
  e = devm_ioremap_resource(e1, res);
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c
index 4db1f8e6e17268e042555fcae6f732d17fed7946..12e566be3793e61eb4fdd7d9ac47a23d638bc260 100644 (file)
--- a/sound/soc/omap/omap-dmic.c
+++ b/sound/soc/omap/omap-dmic.c
@@ -480,15 +480,12 @@ static int asoc_dmic_probe(struct platform_device *pdev)
        dmic->dma_data.filter_data = "up_link";
 
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mpu");
-       if (!res) {
-               dev_err(dmic->dev, "invalid memory resource\n");
-               ret = -ENODEV;
+       dmic->io_base = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(dmic->io_base)) {
+               ret = PTR_ERR(dmic->io_base);
                goto err_put_clk;
        }
 
-       dmic->io_base = devm_ioremap_resource(&pdev->dev, res);
-       if (IS_ERR(dmic->io_base))
-               return PTR_ERR(dmic->io_base);
 
        ret = snd_soc_register_component(&pdev->dev, &omap_dmic_component,
                                         &omap_dmic_dai, 1);

diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c
index a49dc52f8abc03fac075a56c879aa2bdcaaa5568..90d2a7cd2563d06170d450b5bb6a9cc8a6615210 100644 (file)
--- a/sound/soc/omap/omap-mcpdm.c
+++ b/sound/soc/omap/omap-mcpdm.c
@@ -480,9 +480,6 @@ static int asoc_mcpdm_probe(struct platform_device *pdev)
        mcpdm->dma_data[1].filter_data = "up_link";
 
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mpu");
-       if (res == NULL)
-               return -ENOMEM;
-
        mcpdm->io_base = devm_ioremap_resource(&pdev->dev, res);
        if (IS_ERR(mcpdm->io_base))
                return PTR_ERR(mcpdm->io_base);