Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 673c24e9 authored by Julia Lawall's avatar Julia Lawall Committed by Mark Brown
Browse files

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: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Acked-by: default avatarJarkko Nikula <jarkko.nikula@bitmer.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 2aca7891

sound/soc/omap/omap-dmic.c

+3 −6
Original line number Original line Diff line number Diff line
@@ -480,15 +480,12 @@ static int asoc_dmic_probe(struct platform_device *pdev) 
	dmic->dma_data.filter_data = "up_link";

	dmic->dma_data.filter_data = "up_link";





	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mpu");

	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mpu");

	if (!res) {

	dmic->io_base = devm_ioremap_resource(&pdev->dev, res);

		dev_err(dmic->dev, "invalid memory resource\n");

	if (IS_ERR(dmic->io_base)) {

		ret = -ENODEV;

		ret = PTR_ERR(dmic->io_base);

		goto err_put_clk;

		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,

	ret = snd_soc_register_component(&pdev->dev, &omap_dmic_component,

					 &omap_dmic_dai, 1);

					 &omap_dmic_dai, 1);

sound/soc/omap/omap-mcpdm.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -480,9 +480,6 @@ static int asoc_mcpdm_probe(struct platform_device *pdev) 
	mcpdm->dma_data[1].filter_data = "up_link";

	mcpdm->dma_data[1].filter_data = "up_link";





	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mpu");

	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mpu");

	if (res == NULL)

		return -ENOMEM;



	mcpdm->io_base = devm_ioremap_resource(&pdev->dev, res);

	mcpdm->io_base = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(mcpdm->io_base))

	if (IS_ERR(mcpdm->io_base))

		return PTR_ERR(mcpdm->io_base);

		return PTR_ERR(mcpdm->io_base);