diff options
| author | Kevin Hilman <khilman@linaro.org> | 2013-08-20 19:09:49 -0400 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-08-20 19:10:28 -0400 |
| commit | 30f9c3bdcec9c810f5bd05b177367c7eeab24d90 (patch) | |
| tree | f1b4faf38409fb52a7c89efc2093e2aedba151ca | |
| parent | c454194612e2e88d470f10b959db8ca0045c99bb (diff) | |
| parent | 946a88df76a2c5a9f4087fb41efd9d2763872302 (diff) | |
Merge tag 'tegra-for-3.12-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/cleanup
From: Stephen Warren:
ARM: tegra: cleanups for 3.12
This branch includes a single cleanup patch which removes redundant
error-handling for platform_get_resource().
* tag 'tegra-for-3.12-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
tegra: simplify use of devm_ioremap_resource
Signed-off-by: Kevin Hilman <khilman@linaro.org>
| -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]); |
