diff options
author | Thierry Reding <thierry.reding@avionic-design.de> | 2013-01-21 14:09:08 +0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-22 23:41:56 +0400 |
commit | 06303c2e00701724acb95069ca46f87c998c4be1 (patch) | |
tree | 62f3c4a6ba59355eb29a9f5b5a67dc12c85d1751 /drivers/memory/tegra20-mc.c | |
parent | 8d1cbc98838b252af68204780bb0bfac4fe850ec (diff) | |
download | linux-06303c2e00701724acb95069ca46f87c998c4be1.tar.xz |
memory: Convert to devm_ioremap_resource()
Convert all uses of devm_request_and_ioremap() to the newly introduced
devm_ioremap_resource() which provides more consistent error handling.
devm_ioremap_resource() provides its own error messages so all explicit
error messages can be removed from the failure code paths.
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/memory/tegra20-mc.c')
-rw-r--r-- | drivers/memory/tegra20-mc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/memory/tegra20-mc.c b/drivers/memory/tegra20-mc.c index 186f27d9e5f1..2ca5f2814f4a 100644 --- a/drivers/memory/tegra20-mc.c +++ b/drivers/memory/tegra20-mc.c @@ -17,6 +17,7 @@ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. */ +#include <linux/err.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/ratelimit.h> @@ -216,9 +217,9 @@ static int tegra20_mc_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, i); if (!res) return -ENODEV; - mc->regs[i] = devm_request_and_ioremap(&pdev->dev, res); - if (!mc->regs[i]) - return -EBUSY; + mc->regs[i] = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(mc->regs[i])) + return PTR_ERR(mc->regs[i]); } irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0); |