Commit 44a417fa authored by Julia Lawall's avatar Julia Lawall Committed by David Woodhouse
Browse files

mtd: fsmc_nand: 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.

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

drivers/mtd/nand/fsmc_nand.c

+0 −12
Original line number Diff line number Diff line
@@ -958,9 +958,6 @@ static int __init fsmc_nand_probe(struct platform_device *pdev) 
	}



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

	if (!res)

		return -EINVAL;



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

	if (IS_ERR(host->data_va))

		return PTR_ERR(host->data_va);
@@ -968,25 +965,16 @@ static int __init fsmc_nand_probe(struct platform_device *pdev) 
	host->data_pa = (dma_addr_t)res->start;



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

	if (!res)

		return -EINVAL;



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

	if (IS_ERR(host->addr_va))

		return PTR_ERR(host->addr_va);



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

	if (!res)

		return -EINVAL;



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

	if (IS_ERR(host->cmd_va))

		return PTR_ERR(host->cmd_va);



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

	if (!res)

		return -EINVAL;



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

	if (IS_ERR(host->regs_va))

		return PTR_ERR(host->regs_va);