iommu/omap: Allow enable/disable even without pdata

[firefly-linux-kernel-4.4.55.git] / drivers / iommu / omap-iommu.c

diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
index bcd78a720630782313f413d0db8a99adbd7e77da..217952b993e1e7df8d382655dbe4b84059501709 100644 (file)
--- a/drivers/iommu/omap-iommu.c
+++ b/drivers/iommu/omap-iommu.c
@@ -146,13 +146,10 @@ static int iommu_enable(struct omap_iommu *obj)
        struct platform_device *pdev = to_platform_device(obj->dev);
        struct iommu_platform_data *pdata = pdev->dev.platform_data;
 
-       if (!pdata)
-               return -EINVAL;
-
        if (!arch_iommu)
                return -ENODEV;
 
-       if (pdata->deassert_reset) {
+       if (pdata && pdata->deassert_reset) {
                err = pdata->deassert_reset(pdev, pdata->reset_name);
                if (err) {
                        dev_err(obj->dev, "deassert_reset failed: %d\n", err);
@@ -172,14 +169,11 @@ static void iommu_disable(struct omap_iommu *obj)
        struct platform_device *pdev = to_platform_device(obj->dev);
        struct iommu_platform_data *pdata = pdev->dev.platform_data;
 
-       if (!pdata)
-               return;
-
        arch_iommu->disable(obj);
 
        pm_runtime_put_sync(obj->dev);
 
-       if (pdata->assert_reset)
+       if (pdata && pdata->assert_reset)
                pdata->assert_reset(pdev, pdata->reset_name);
 }
 
@@ -863,7 +857,7 @@ static int device_match_by_alias(struct device *dev, void *data)
  **/
 static struct omap_iommu *omap_iommu_attach(const char *name, u32 *iopgd)
 {
-       int err = -ENOMEM;
+       int err;
        struct device *dev;
        struct omap_iommu *obj;
 
@@ -871,7 +865,7 @@ static struct omap_iommu *omap_iommu_attach(const char *name, u32 *iopgd)
                                (void *)name,
                                device_match_by_alias);
        if (!dev)
-               return NULL;
+               return ERR_PTR(-ENODEV);
 
        obj = to_iommu(dev);
 
@@ -890,8 +884,10 @@ static struct omap_iommu *omap_iommu_attach(const char *name, u32 *iopgd)
                goto err_enable;
        flush_iotlb_all(obj);
 
-       if (!try_module_get(obj->owner))
+       if (!try_module_get(obj->owner)) {
+               err = -ENODEV;
                goto err_module;
+       }
 
        spin_unlock(&obj->iommu_lock);
 
@@ -941,7 +937,7 @@ static int omap_iommu_probe(struct platform_device *pdev)
        struct resource *res;
        struct iommu_platform_data *pdata = pdev->dev.platform_data;
 
-       obj = kzalloc(sizeof(*obj) + MMU_REG_SIZE, GFP_KERNEL);
+       obj = devm_kzalloc(&pdev->dev, sizeof(*obj) + MMU_REG_SIZE, GFP_KERNEL);
        if (!obj)
                return -ENOMEM;
 
@@ -958,33 +954,18 @@ static int omap_iommu_probe(struct platform_device *pdev)
        INIT_LIST_HEAD(&obj->mmap);
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!res) {
-               err = -ENODEV;
-               goto err_mem;
-       }
-
-       res = request_mem_region(res->start, resource_size(res),
-                                dev_name(&pdev->dev));
-       if (!res) {
-               err = -EIO;
-               goto err_mem;
-       }
-
-       obj->regbase = ioremap(res->start, resource_size(res));
-       if (!obj->regbase) {
-               err = -ENOMEM;
-               goto err_ioremap;
-       }
+       obj->regbase = devm_ioremap_resource(obj->dev, res);
+       if (IS_ERR(obj->regbase))
+               return PTR_ERR(obj->regbase);
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               err = -ENODEV;
-               goto err_irq;
-       }
-       err = request_irq(irq, iommu_fault_handler, IRQF_SHARED,
-                         dev_name(&pdev->dev), obj);
+       if (irq < 0)
+               return -ENODEV;
+
+       err = devm_request_irq(obj->dev, irq, iommu_fault_handler, IRQF_SHARED,
+                              dev_name(obj->dev), obj);
        if (err < 0)
-               goto err_irq;
+               return err;
        platform_set_drvdata(pdev, obj);
 
        pm_runtime_irq_safe(obj->dev);
@@ -992,34 +973,17 @@ static int omap_iommu_probe(struct platform_device *pdev)
 
        dev_info(&pdev->dev, "%s registered\n", obj->name);
        return 0;
-
-err_irq:
-       iounmap(obj->regbase);
-err_ioremap:
-       release_mem_region(res->start, resource_size(res));
-err_mem:
-       kfree(obj);
-       return err;
 }
 
 static int omap_iommu_remove(struct platform_device *pdev)
 {
-       int irq;
-       struct resource *res;
        struct omap_iommu *obj = platform_get_drvdata(pdev);
 
        iopgtable_clear_entry_all(obj);
 
-       irq = platform_get_irq(pdev, 0);
-       free_irq(irq, obj);
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       release_mem_region(res->start, resource_size(res));
-       iounmap(obj->regbase);
-
        pm_runtime_disable(obj->dev);
 
        dev_info(&pdev->dev, "%s removed\n", obj->name);
-       kfree(obj);
        return 0;
 }