iommu: Convert to devm_ioremap_resource()

[mirror_ubuntu-artful-kernel.git] / drivers / iommu / tegra-smmu.c

diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c
index fc178893789a444ee9ac0267c4993fc3ba152e49..f08dbcd2f17585875e863a7ec24c032d8ee40413 100644 (file)
--- a/drivers/iommu/tegra-smmu.c
+++ b/drivers/iommu/tegra-smmu.c
@@ -19,6 +19,7 @@
 
 #define pr_fmt(fmt)    "%s(): " fmt, __func__
 
+#include <linux/err.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/spinlock.h>
@@ -1176,9 +1177,9 @@ static int tegra_smmu_probe(struct platform_device *pdev)
                res = platform_get_resource(pdev, IORESOURCE_MEM, i);
                if (!res)
                        return -ENODEV;
-               smmu->regs[i] = devm_request_and_ioremap(&pdev->dev, res);
-               if (!smmu->regs[i])
-                       return -EBUSY;
+               smmu->regs[i] = devm_ioremap_resource(&pdev->dev, res);
+               if (IS_ERR(smmu->regs[i]))
+                       return PTR_ERR(smmu->regs[i]);
        }
 
        err = of_get_dma_window(dev->of_node, NULL, 0, NULL, &base, &size);