iommu/omap: eliminate the public omap_find_iommu_device() method

Eliminate the public omap_find_iommu_device() method, and don't
expect clients to provide the omap_iommu handle anymore.

Instead, OMAP's iommu driver now utilizes dev_archdata's private iommu
extension to be able to access the required iommu information.

This way OMAP IOMMU users are now able to use the generic IOMMU API without
having to call any omap-specific binding method.

Update omap3isp appropriately.

Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Cc: Hiroshi Doyu <hdoyu@nvidia.com>

1 files changed, 26 insertions, 32 deletions

diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
index 8f32b2bf7587..b7f863d72c08 100644
--- a/drivers/iommu/omap-iommu.c
+++ b/drivers/iommu/omap-iommu.c
@@ -86,20 +86,24 @@ EXPORT_SYMBOL_GPL(omap_uninstall_iommu_arch);
 
 /**
  * omap_iommu_save_ctx - Save registers for pm off-mode support
- * @obj:        target iommu
+ * @dev:        client device
  **/
-void omap_iommu_save_ctx(struct omap_iommu *obj)
+void omap_iommu_save_ctx(struct device *dev)
 {
+        struct omap_iommu *obj = dev_to_omap_iommu(dev);
+
         arch_iommu->save_ctx(obj);
 }
 EXPORT_SYMBOL_GPL(omap_iommu_save_ctx);
 
 /**
  * omap_iommu_restore_ctx - Restore registers for pm off-mode support
- * @obj:        target iommu
+ * @dev:        client device
  **/
-void omap_iommu_restore_ctx(struct omap_iommu *obj)
+void omap_iommu_restore_ctx(struct device *dev)
 {
+        struct omap_iommu *obj = dev_to_omap_iommu(dev);
+
         arch_iommu->restore_ctx(obj);
 }
 EXPORT_SYMBOL_GPL(omap_iommu_restore_ctx);
@@ -820,35 +824,23 @@ static int device_match_by_alias(struct device *dev, void *data)
 }
 
 /**
- * omap_find_iommu_device() - find an omap iommu device by name
- * @name:       name of the iommu device
- *
- * The generic iommu API requires the caller to provide the device
- * he wishes to attach to a certain iommu domain.
- *
- * Drivers generally should not bother with this as it should just
- * be taken care of by the DMA-API using dev_archdata.
- *
- * This function is provided as an interim solution until the latter
- * materializes, and omap3isp is fully migrated to the DMA-API.
- */
-struct device *omap_find_iommu_device(const char *name)
-{
-        return driver_find_device(&omap_iommu_driver.driver, NULL,
-                                (void *)name,
-                                device_match_by_alias);
-}
-EXPORT_SYMBOL_GPL(omap_find_iommu_device);
-
-/**
  * omap_iommu_attach() - attach iommu device to an iommu domain
- * @dev:        target omap iommu device
+ * @name:       name of target omap iommu device
  * @iopgd:      page table
  **/
-static struct omap_iommu *omap_iommu_attach(struct device *dev, u32 *iopgd)
+static struct omap_iommu *omap_iommu_attach(const char *name, u32 *iopgd)
 {
         int err = -ENOMEM;
-        struct omap_iommu *obj = to_iommu(dev);
+        struct device *dev;
+        struct omap_iommu *obj;
+
+        dev = driver_find_device(&omap_iommu_driver.driver, NULL,
+                                (void *)name,
+                                device_match_by_alias);
+        if (!dev)
+                return NULL;
+
+        obj = to_iommu(dev);
 
         spin_lock(&obj->iommu_lock);
 
@@ -1069,6 +1061,7 @@ omap_iommu_attach_dev(struct iommu_domain *domain, struct device *dev)
 {
         struct omap_iommu_domain *omap_domain = domain->priv;
         struct omap_iommu *oiommu;
+        struct omap_iommu_arch_data *arch_data = dev->archdata.iommu;
         int ret = 0;
 
         spin_lock(&omap_domain->lock);
@@ -1081,14 +1074,14 @@ omap_iommu_attach_dev(struct iommu_domain *domain, struct device *dev)
         }
 
         /* get a handle to and enable the omap iommu */
-        oiommu = omap_iommu_attach(dev, omap_domain->pgtable);
+        oiommu = omap_iommu_attach(arch_data->name, omap_domain->pgtable);
         if (IS_ERR(oiommu)) {
                 ret = PTR_ERR(oiommu);
                 dev_err(dev, "can't get omap iommu: %d\n", ret);
                 goto out;
         }
 
-        omap_domain->iommu_dev = oiommu;
+        omap_domain->iommu_dev = arch_data->iommu_dev = oiommu;
         oiommu->domain = domain;
 
 out:
@@ -1100,7 +1093,8 @@ static void omap_iommu_detach_dev(struct iommu_domain *domain,
                                  struct device *dev)
 {
         struct omap_iommu_domain *omap_domain = domain->priv;
-        struct omap_iommu *oiommu = to_iommu(dev);
+        struct omap_iommu_arch_data *arch_data = dev->archdata.iommu;
+        struct omap_iommu *oiommu = dev_to_omap_iommu(dev);
 
         spin_lock(&omap_domain->lock);
 
@@ -1114,7 +1108,7 @@ static void omap_iommu_detach_dev(struct iommu_domain *domain,
 
         omap_iommu_detach(oiommu);
 
-        omap_domain->iommu_dev = NULL;
+        omap_domain->iommu_dev = arch_data->iommu_dev = NULL;
 
 out:
         spin_unlock(&omap_domain->lock);