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

Commit 51617d1b authored by Julia Lawall's avatar Julia Lawall Committed by Tomi Valkeinen
Browse files

video: mxsfb: 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>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 907355a9

drivers/video/mxsfb.c

+1 −6
Original line number Original line Diff line number Diff line
@@ -881,12 +881,6 @@ static int mxsfb_probe(struct platform_device *pdev) 
	if (of_id)

	if (of_id)

		pdev->id_entry = of_id->data;

		pdev->id_entry = of_id->data;





	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

		dev_err(&pdev->dev, "Cannot get memory IO resource\n");

		return -ENODEV;

	}



	fb_info = framebuffer_alloc(sizeof(struct mxsfb_info), &pdev->dev);

	fb_info = framebuffer_alloc(sizeof(struct mxsfb_info), &pdev->dev);

	if (!fb_info) {

	if (!fb_info) {

		dev_err(&pdev->dev, "Failed to allocate fbdev\n");

		dev_err(&pdev->dev, "Failed to allocate fbdev\n");
@@ -895,6 +889,7 @@ static int mxsfb_probe(struct platform_device *pdev) 




	host = to_imxfb_host(fb_info);

	host = to_imxfb_host(fb_info);





	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

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

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

	if (IS_ERR(host->base)) {

	if (IS_ERR(host->base)) {

		ret = PTR_ERR(host->base);

		ret = PTR_ERR(host->base);