Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30f9c3bd authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'tegra-for-3.12-cleanup' of... 

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: default avatarKevin Hilman <khilman@linaro.org>
parents c4541946 946a88df

drivers/iommu/tegra-smmu.c

+0 −2
Original line number Diff line number Diff line
@@ -1177,8 +1177,6 @@ static int tegra_smmu_probe(struct platform_device *pdev) 
		struct resource *res;



		res = platform_get_resource(pdev, IORESOURCE_MEM, i);

		if (!res)

			return -ENODEV;

		smmu->regs[i] = devm_ioremap_resource(&pdev->dev, res);

		if (IS_ERR(smmu->regs[i]))

			return PTR_ERR(smmu->regs[i]);

drivers/memory/tegra20-mc.c

+0 −2
Original line number Diff line number Diff line
@@ -218,8 +218,6 @@ static int tegra20_mc_probe(struct platform_device *pdev) 
		struct resource *res;



		res = platform_get_resource(pdev, IORESOURCE_MEM, i);

		if (!res)

			return -ENODEV;

		mc->regs[i] = devm_ioremap_resource(&pdev->dev, res);

		if (IS_ERR(mc->regs[i]))

			return PTR_ERR(mc->regs[i]);

drivers/memory/tegra30-mc.c

+0 −2
Original line number Diff line number Diff line
@@ -340,8 +340,6 @@ static int tegra30_mc_probe(struct platform_device *pdev) 
		struct resource *res;



		res = platform_get_resource(pdev, IORESOURCE_MEM, i);

		if (!res)

			return -ENODEV;

		mc->regs[i] = devm_ioremap_resource(&pdev->dev, res);

		if (IS_ERR(mc->regs[i]))

			return PTR_ERR(mc->regs[i]);