aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand/fsmc_nand.c
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2013-08-19 04:51:53 -0400
committerDavid Woodhouse <David.Woodhouse@intel.com>2013-08-30 16:42:20 -0400
commit44a417fa0fbf41a48f09cf90d06550764b530c0e (patch)
tree61e5ee0a1fe0154ee5cac6de03b69828b16bcc3b /drivers/mtd/nand/fsmc_nand.c
parent2fa831f9db1f1a13960f4ea0fd0454402717b453 (diff)
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: Julia Lawall <Julia.Lawall@lip6.fr> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd/nand/fsmc_nand.c')
-rw-r--r--drivers/mtd/nand/fsmc_nand.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c
index 2a3b1b90a562..3dc1a7564d87 100644
--- a/drivers/mtd/nand/fsmc_nand.c
+++ b/drivers/mtd/nand/fsmc_nand.c
@@ -958,9 +958,6 @@ static int __init fsmc_nand_probe(struct platform_device *pdev)
958 } 958 }
959 959
960 res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "nand_data"); 960 res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "nand_data");
961 if (!res)
962 return -EINVAL;
963
964 host->data_va = devm_ioremap_resource(&pdev->dev, res); 961 host->data_va = devm_ioremap_resource(&pdev->dev, res);
965 if (IS_ERR(host->data_va)) 962 if (IS_ERR(host->data_va))
966 return PTR_ERR(host->data_va); 963 return PTR_ERR(host->data_va);
@@ -968,25 +965,16 @@ static int __init fsmc_nand_probe(struct platform_device *pdev)
968 host->data_pa = (dma_addr_t)res->start; 965 host->data_pa = (dma_addr_t)res->start;
969 966
970 res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "nand_addr"); 967 res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "nand_addr");
971 if (!res)
972 return -EINVAL;
973
974 host->addr_va = devm_ioremap_resource(&pdev->dev, res); 968 host->addr_va = devm_ioremap_resource(&pdev->dev, res);
975 if (IS_ERR(host->addr_va)) 969 if (IS_ERR(host->addr_va))
976 return PTR_ERR(host->addr_va); 970 return PTR_ERR(host->addr_va);
977 971
978 res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "nand_cmd"); 972 res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "nand_cmd");
979 if (!res)
980 return -EINVAL;
981
982 host->cmd_va = devm_ioremap_resource(&pdev->dev, res); 973 host->cmd_va = devm_ioremap_resource(&pdev->dev, res);
983 if (IS_ERR(host->cmd_va)) 974 if (IS_ERR(host->cmd_va))
984 return PTR_ERR(host->cmd_va); 975 return PTR_ERR(host->cmd_va);
985 976
986 res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "fsmc_regs"); 977 res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "fsmc_regs");
987 if (!res)
988 return -EINVAL;
989
990 host->regs_va = devm_ioremap_resource(&pdev->dev, res); 978 host->regs_va = devm_ioremap_resource(&pdev->dev, res);
991 if (IS_ERR(host->regs_va)) 979 if (IS_ERR(host->regs_va))
992 return PTR_ERR(host->regs_va); 980 return PTR_ERR(host->regs_va);