diff options
author | Julia Lawall <Julia.Lawall@lip6.fr> | 2013-08-14 05:11:10 -0400 |
---|---|---|
committer | Stephen Warren <swarren@nvidia.com> | 2013-08-15 18:04:42 -0400 |
commit | 946a88df76a2c5a9f4087fb41efd9d2763872302 (patch) | |
tree | 7e33bee8701fbd5e011aeccec60361956f46bc79 | |
parent | ad81f0545ef01ea651886dddac4bef6cec930092 (diff) |
tegra: 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.
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: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
-rw-r--r-- | drivers/iommu/tegra-smmu.c | 2 | ||||
-rw-r--r-- | drivers/memory/tegra20-mc.c | 2 | ||||
-rw-r--r-- | drivers/memory/tegra30-mc.c | 2 |
3 files changed, 0 insertions, 6 deletions
diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c index f6f120e25409..e0665603afd9 100644 --- a/drivers/iommu/tegra-smmu.c +++ b/drivers/iommu/tegra-smmu.c | |||
@@ -1177,8 +1177,6 @@ static int tegra_smmu_probe(struct platform_device *pdev) | |||
1177 | struct resource *res; | 1177 | struct resource *res; |
1178 | 1178 | ||
1179 | res = platform_get_resource(pdev, IORESOURCE_MEM, i); | 1179 | res = platform_get_resource(pdev, IORESOURCE_MEM, i); |
1180 | if (!res) | ||
1181 | return -ENODEV; | ||
1182 | smmu->regs[i] = devm_ioremap_resource(&pdev->dev, res); | 1180 | smmu->regs[i] = devm_ioremap_resource(&pdev->dev, res); |
1183 | if (IS_ERR(smmu->regs[i])) | 1181 | if (IS_ERR(smmu->regs[i])) |
1184 | return PTR_ERR(smmu->regs[i]); | 1182 | return PTR_ERR(smmu->regs[i]); |
diff --git a/drivers/memory/tegra20-mc.c b/drivers/memory/tegra20-mc.c index 0548eeacd573..7cd82b874abd 100644 --- a/drivers/memory/tegra20-mc.c +++ b/drivers/memory/tegra20-mc.c | |||
@@ -218,8 +218,6 @@ static int tegra20_mc_probe(struct platform_device *pdev) | |||
218 | struct resource *res; | 218 | struct resource *res; |
219 | 219 | ||
220 | res = platform_get_resource(pdev, IORESOURCE_MEM, i); | 220 | res = platform_get_resource(pdev, IORESOURCE_MEM, i); |
221 | if (!res) | ||
222 | return -ENODEV; | ||
223 | mc->regs[i] = devm_ioremap_resource(&pdev->dev, res); | 221 | mc->regs[i] = devm_ioremap_resource(&pdev->dev, res); |
224 | if (IS_ERR(mc->regs[i])) | 222 | if (IS_ERR(mc->regs[i])) |
225 | return PTR_ERR(mc->regs[i]); | 223 | return PTR_ERR(mc->regs[i]); |
diff --git a/drivers/memory/tegra30-mc.c b/drivers/memory/tegra30-mc.c index 58d2979b4035..ef7934535fd1 100644 --- a/drivers/memory/tegra30-mc.c +++ b/drivers/memory/tegra30-mc.c | |||
@@ -340,8 +340,6 @@ static int tegra30_mc_probe(struct platform_device *pdev) | |||
340 | struct resource *res; | 340 | struct resource *res; |
341 | 341 | ||
342 | res = platform_get_resource(pdev, IORESOURCE_MEM, i); | 342 | res = platform_get_resource(pdev, IORESOURCE_MEM, i); |
343 | if (!res) | ||
344 | return -ENODEV; | ||
345 | mc->regs[i] = devm_ioremap_resource(&pdev->dev, res); | 343 | mc->regs[i] = devm_ioremap_resource(&pdev->dev, res); |
346 | if (IS_ERR(mc->regs[i])) | 344 | if (IS_ERR(mc->regs[i])) |
347 | return PTR_ERR(mc->regs[i]); | 345 | return PTR_ERR(mc->regs[i]); |