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

Commit 88d5a2e6 authored by Julia Lawall's avatar Julia Lawall Committed by Thierry Reding
Browse files

pwm: 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: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
parent 382457e5

drivers/pwm/pwm-lpc32xx.c

+0 −3
Original line number Diff line number Diff line
@@ -124,9 +124,6 @@ static int lpc32xx_pwm_probe(struct platform_device *pdev) 
		return -ENOMEM;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res)

		return -EINVAL;



	lpc32xx->base = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(lpc32xx->base))

		return PTR_ERR(lpc32xx->base);

drivers/pwm/pwm-renesas-tpu.c

+0 −5
Original line number Diff line number Diff line
@@ -418,11 +418,6 @@ static int tpu_probe(struct platform_device *pdev) 


	/* Map memory, get clock and pin control. */

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

		dev_err(&pdev->dev, "failed to get I/O memory\n");

		return -ENXIO;

	}



	tpu->base = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(tpu->base))

		return PTR_ERR(tpu->base);

drivers/pwm/pwm-spear.c

+1 −6
Original line number Diff line number Diff line
@@ -178,18 +178,13 @@ static int spear_pwm_probe(struct platform_device *pdev) 
	int ret;

	u32 val;



	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!r) {

		dev_err(&pdev->dev, "no memory resources defined\n");

		return -ENODEV;

	}



	pc = devm_kzalloc(&pdev->dev, sizeof(*pc), GFP_KERNEL);

	if (!pc) {

		dev_err(&pdev->dev, "failed to allocate memory\n");

		return -ENOMEM;

	}



	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	pc->mmio_base = devm_ioremap_resource(&pdev->dev, r);

	if (IS_ERR(pc->mmio_base))

		return PTR_ERR(pc->mmio_base);