Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3acb04ca authored Oct 22, 2014 by Suman Anna Committed by Joerg Roedel Oct 23, 2014

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>

parent 2b313dd1

drivers/iommu/omap-iommu.c

+0 −9

Original line number	Original line	Diff line number	Diff line
	@@ -138,15 +138,6 @@ void omap_iommu_restore_ctx(struct device *dev)
	}		}
	EXPORT_SYMBOL_GPL(omap_iommu_restore_ctx);		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)		static int iommu_enable(struct omap_iommu *obj)
	{		{
	int err;		int err;

drivers/iommu/omap-iommu.h

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -70,8 +70,6 @@ struct cr_regs {

	/* architecture specific functions */		/* architecture specific functions */
	struct iommu_functions {		struct iommu_functions {
	unsigned long version;

	int (enable)(struct omap_iommu obj);		int (enable)(struct omap_iommu obj);
	void (disable)(struct omap_iommu obj);		void (disable)(struct omap_iommu obj);
	void (set_twl)(struct omap_iommu obj, bool on);		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		* 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 void omap_iotlb_cr_to_e(struct cr_regs cr, struct iotlb_entry e);

	extern int		extern int

drivers/iommu/omap-iommu2.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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 = {		static const struct iommu_functions omap2_iommu_ops = {
	.version = IOMMU_ARCH_VERSION,

	.enable = omap2_iommu_enable,		.enable = omap2_iommu_enable,
	.disable = omap2_iommu_disable,		.disable = omap2_iommu_disable,
	.set_twl = omap2_iommu_set_twl,		.set_twl = omap2_iommu_set_twl,