Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[karo-tx-linux.git] / drivers / iommu / shmobile-ipmmu.c

diff --git a/drivers/iommu/shmobile-ipmmu.c b/drivers/iommu/shmobile-ipmmu.c
index e3bc2e19b6dd8f2cd7bd91b30120ecbba477abe3..bd97adecb1fd28fb1419db63c261a1fadd7cf4f9 100644 (file)
--- a/drivers/iommu/shmobile-ipmmu.c
+++ b/drivers/iommu/shmobile-ipmmu.c
@@ -94,11 +94,6 @@ static int ipmmu_probe(struct platform_device *pdev)
        struct resource *res;
        struct shmobile_ipmmu_platform_data *pdata = pdev->dev.platform_data;
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!res) {
-               dev_err(&pdev->dev, "cannot get platform resources\n");
-               return -ENOENT;
-       }
        ipmmu = devm_kzalloc(&pdev->dev, sizeof(*ipmmu), GFP_KERNEL);
        if (!ipmmu) {
                dev_err(&pdev->dev, "cannot allocate device data\n");
@@ -106,19 +101,18 @@ static int ipmmu_probe(struct platform_device *pdev)
        }
        spin_lock_init(&ipmmu->flush_lock);
        ipmmu->dev = &pdev->dev;
-       ipmmu->ipmmu_base = devm_ioremap_nocache(&pdev->dev, res->start,
-                                               resource_size(res));
-       if (!ipmmu->ipmmu_base) {
-               dev_err(&pdev->dev, "ioremap_nocache failed\n");
-               return -ENOMEM;
-       }
+
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       ipmmu->ipmmu_base = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(ipmmu->ipmmu_base))
+               return PTR_ERR(ipmmu->ipmmu_base);
+
        ipmmu->dev_names = pdata->dev_names;
        ipmmu->num_dev_names = pdata->num_dev_names;
        platform_set_drvdata(pdev, ipmmu);
        ipmmu_reg_write(ipmmu, IMCTR1, 0x0); /* disable TLB */
        ipmmu_reg_write(ipmmu, IMCTR2, 0x0); /* disable PMB */
-       ipmmu_iommu_init(ipmmu);
-       return 0;
+       return ipmmu_iommu_init(ipmmu);
 }
 
 static struct platform_driver ipmmu_driver = {