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

Commit 0ddc5ec1 authored by Julia Lawall's avatar Julia Lawall Committed by Ohad Ben-Cohen
Browse files

remoteproc/davinci: 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>
[simplify patch title]
Signed-off-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
parent 5d658bfd

drivers/remoteproc/da8xx_remoteproc.c

+1 −13
Original line number Original line Diff line number Diff line
@@ -201,23 +201,11 @@ static int da8xx_rproc_probe(struct platform_device *pdev) 
	}

	}





	bootreg_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	bootreg_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!bootreg_res) {

		dev_err(dev,

			"platform_get_resource(IORESOURCE_MEM, 0): NULL\n");

		return -EADDRNOTAVAIL;

	}



	chipsig_res = platform_get_resource(pdev, IORESOURCE_MEM, 1);

	if (!chipsig_res) {

		dev_err(dev,

			"platform_get_resource(IORESOURCE_MEM, 1): NULL\n");

		return -EADDRNOTAVAIL;

	}



	bootreg = devm_ioremap_resource(dev, bootreg_res);

	bootreg = devm_ioremap_resource(dev, bootreg_res);

	if (IS_ERR(bootreg))

	if (IS_ERR(bootreg))

		return PTR_ERR(bootreg);

		return PTR_ERR(bootreg);





	chipsig_res = platform_get_resource(pdev, IORESOURCE_MEM, 1);

	chipsig = devm_ioremap_resource(dev, chipsig_res);

	chipsig = devm_ioremap_resource(dev, chipsig_res);

	if (IS_ERR(chipsig))

	if (IS_ERR(chipsig))

		return PTR_ERR(chipsig);

		return PTR_ERR(chipsig);