aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2014-09-09 11:45:45 -0400
committerJoerg Roedel <jroedel@suse.de>2014-09-25 09:56:37 -0400
commita6fda0f586bb2c39e763a2ae5561e1f6ade8c3a8 (patch)
treea2474ae77d3f52a41fe93d0891d8f3da5d005769
parent7d6827748d54f1745314e4e582691e8c02b9b4af (diff)
iommu/omap: Remove omap_iommu unused owner field
The owner field is never set. Remove it. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Suman Anna <s-anna@ti.com> Signed-off-by: Joerg Roedel <jroedel@suse.de>
-rw-r--r--drivers/iommu/omap-iommu.c10
-rw-r--r--drivers/iommu/omap-iommu.h1
2 files changed, 0 insertions, 11 deletions
diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
index df579f8779cd..4b432c40580d 100644
--- a/drivers/iommu/omap-iommu.c
+++ b/drivers/iommu/omap-iommu.c
@@ -893,19 +893,11 @@ static struct omap_iommu *omap_iommu_attach(const char *name, u32 *iopgd)
893 goto err_enable; 893 goto err_enable;
894 flush_iotlb_all(obj); 894 flush_iotlb_all(obj);
895 895
896 if (!try_module_get(obj->owner)) {
897 err = -ENODEV;
898 goto err_module;
899 }
900
901 spin_unlock(&obj->iommu_lock); 896 spin_unlock(&obj->iommu_lock);
902 897
903 dev_dbg(obj->dev, "%s: %s\n", __func__, obj->name); 898 dev_dbg(obj->dev, "%s: %s\n", __func__, obj->name);
904 return obj; 899 return obj;
905 900
906err_module:
907 if (obj->refcount == 1)
908 iommu_disable(obj);
909err_enable: 901err_enable:
910 obj->refcount--; 902 obj->refcount--;
911 spin_unlock(&obj->iommu_lock); 903 spin_unlock(&obj->iommu_lock);
@@ -926,8 +918,6 @@ static void omap_iommu_detach(struct omap_iommu *obj)
926 if (--obj->refcount == 0) 918 if (--obj->refcount == 0)
927 iommu_disable(obj); 919 iommu_disable(obj);
928 920
929 module_put(obj->owner);
930
931 obj->iopgd = NULL; 921 obj->iopgd = NULL;
932 922
933 spin_unlock(&obj->iommu_lock); 923 spin_unlock(&obj->iommu_lock);
diff --git a/drivers/iommu/omap-iommu.h b/drivers/iommu/omap-iommu.h
index 1275a822934b..4f1b68c08c15 100644
--- a/drivers/iommu/omap-iommu.h
+++ b/drivers/iommu/omap-iommu.h
@@ -28,7 +28,6 @@ struct iotlb_entry {
28 28
29struct omap_iommu { 29struct omap_iommu {
30 const char *name; 30 const char *name;
31 struct module *owner;
32 void __iomem *regbase; 31 void __iomem *regbase;
33 struct device *dev; 32 struct device *dev;
34 void *isr_priv; 33 void *isr_priv;