diff options
| author | Suman Anna <s-anna@ti.com> | 2014-10-22 17:22:24 -0500 | 
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2014-10-23 14:32:25 +0200 | 
| commit | 3acb04ca5ea4e03c5718a87b713b2fd6f7f52b51 (patch) | |
| tree | bd44afe720aece9072f3f2b4b35095aa0ba0f864 | |
| parent | 2b313dd13a1690b9c4e2a968feea890838b77b81 (diff) | |
iommu/omap: Remove omap_iommu_arch_version() and version field
The function omap_iommu_arch_version() is not used anymore,
and is not required either, so remove it. The .version field
in struct iommu_functions that this function uses is also
removed, as it is not really an ops to retrieve a version and
there won't be any usage for this field either.
Signed-off-by: Suman Anna <s-anna@ti.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
| -rw-r--r-- | drivers/iommu/omap-iommu.c | 9 | ||||
| -rw-r--r-- | drivers/iommu/omap-iommu.h | 4 | ||||
| -rw-r--r-- | drivers/iommu/omap-iommu2.c | 2 | 
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)  }  EXPORT_SYMBOL_GPL(omap_iommu_restore_ctx); -/** - * omap_iommu_arch_version - Return running iommu arch version - **/ -u32 omap_iommu_arch_version(void) -{ -	return arch_iommu->version; -} -EXPORT_SYMBOL_GPL(omap_iommu_arch_version); -  static int iommu_enable(struct omap_iommu *obj)  {  	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 {  /* architecture specific functions */  struct iommu_functions { -	unsigned long	version; -  	int (*enable)(struct omap_iommu *obj);  	void (*disable)(struct omap_iommu *obj);  	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)  /*   * global functions   */ -extern u32 omap_iommu_arch_version(void); -  extern void omap_iotlb_cr_to_e(struct cr_regs *cr, struct iotlb_entry *e);  extern 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)  }  static const struct iommu_functions omap2_iommu_ops = { -	.version	= IOMMU_ARCH_VERSION, -  	.enable		= omap2_iommu_enable,  	.disable	= omap2_iommu_disable,  	.set_twl	= omap2_iommu_set_twl, | 
