aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/iommu/omap-iommu.c9
-rw-r--r--drivers/iommu/omap-iommu.h4
-rw-r--r--drivers/iommu/omap-iommu2.c2
3 files changed, 0 insertions, 15 deletions
diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
index ea04e4d30bbf..f9efa6ba99f5 100644
--- a/drivers/iommu/omap-iommu.c
+++ b/drivers/iommu/omap-iommu.c
@@ -138,15 +138,6 @@ void omap_iommu_restore_ctx(struct device *dev)
138} 138}
139EXPORT_SYMBOL_GPL(omap_iommu_restore_ctx); 139EXPORT_SYMBOL_GPL(omap_iommu_restore_ctx);
140 140
141/**
142 * omap_iommu_arch_version - Return running iommu arch version
143 **/
144u32 omap_iommu_arch_version(void)
145{
146 return arch_iommu->version;
147}
148EXPORT_SYMBOL_GPL(omap_iommu_arch_version);
149
150static int iommu_enable(struct omap_iommu *obj) 141static int iommu_enable(struct omap_iommu *obj)
151{ 142{
152 int err; 143 int err;
diff --git a/drivers/iommu/omap-iommu.h b/drivers/iommu/omap-iommu.h
index d7c51327cd25..45fe67d641e2 100644
--- a/drivers/iommu/omap-iommu.h
+++ b/drivers/iommu/omap-iommu.h
@@ -70,8 +70,6 @@ struct cr_regs {
70 70
71/* architecture specific functions */ 71/* architecture specific functions */
72struct iommu_functions { 72struct iommu_functions {
73 unsigned long version;
74
75 int (*enable)(struct omap_iommu *obj); 73 int (*enable)(struct omap_iommu *obj);
76 void (*disable)(struct omap_iommu *obj); 74 void (*disable)(struct omap_iommu *obj);
77 void (*set_twl)(struct omap_iommu *obj, bool on); 75 void (*set_twl)(struct omap_iommu *obj, bool on);
@@ -191,8 +189,6 @@ static inline struct omap_iommu *dev_to_omap_iommu(struct device *dev)
191/* 189/*
192 * global functions 190 * global functions
193 */ 191 */
194extern u32 omap_iommu_arch_version(void);
195
196extern void omap_iotlb_cr_to_e(struct cr_regs *cr, struct iotlb_entry *e); 192extern void omap_iotlb_cr_to_e(struct cr_regs *cr, struct iotlb_entry *e);
197 193
198extern int 194extern int
diff --git a/drivers/iommu/omap-iommu2.c b/drivers/iommu/omap-iommu2.c
index 5e1ea3b0bf16..2f6a9f76c6ee 100644
--- a/drivers/iommu/omap-iommu2.c
+++ b/drivers/iommu/omap-iommu2.c
@@ -297,8 +297,6 @@ static void omap2_cr_to_e(struct cr_regs *cr, struct iotlb_entry *e)
297} 297}
298 298
299static const struct iommu_functions omap2_iommu_ops = { 299static const struct iommu_functions omap2_iommu_ops = {
300 .version = IOMMU_ARCH_VERSION,
301
302 .enable = omap2_iommu_enable, 300 .enable = omap2_iommu_enable,
303 .disable = omap2_iommu_disable, 301 .disable = omap2_iommu_disable,
304 .set_twl = omap2_iommu_set_twl, 302 .set_twl = omap2_iommu_set_twl,