Commit 7a96541a authored by Julia Lawall's avatar Julia Lawall Committed by David Woodhouse
Browse files

mtd: 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 avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 39de86ef

drivers/mtd/devices/elm.c

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



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

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

		return -ENODEV;

	}



	info->elm_base = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(info->elm_base))

		return PTR_ERR(info->elm_base);

drivers/mtd/nand/txx9ndfmc.c

+1 −3
Original line number Diff line number Diff line
@@ -281,12 +281,10 @@ static int __init txx9ndfmc_probe(struct platform_device *dev) 
	unsigned long gbusclk = plat->gbus_clock;

	struct resource *res;



	res = platform_get_resource(dev, IORESOURCE_MEM, 0);

	if (!res)

		return -ENODEV;

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

	if (!drvdata)

		return -ENOMEM;

	res = platform_get_resource(dev, IORESOURCE_MEM, 0);

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

	if (IS_ERR(drvdata->base))

		return PTR_ERR(drvdata->base);