diff options
| author | Suman Anna <s-anna@ti.com> | 2014-10-22 17:22:22 -0500 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2014-10-23 14:32:25 +0200 |
| commit | 533b40cccd2fbe8cf6ba361cab7e99f626be45bf (patch) | |
| tree | ab3cdfe030506a670be643ab0185aa3280d9d4bf /drivers/iommu/omap-iommu.h | |
| parent | 52dad776fcb644f9ccfc1986c965bd9438e59b21 (diff) | |
| download | linux-stable-533b40cccd2fbe8cf6ba361cab7e99f626be45bf.tar.gz linux-stable-533b40cccd2fbe8cf6ba361cab7e99f626be45bf.tar.bz2 linux-stable-533b40cccd2fbe8cf6ba361cab7e99f626be45bf.zip | |
iommu/omap: Remove conditional definition of dev_to_omap_iommu()
The dev_to_omap_iommu() is local to the OMAP IOMMU modules, and
need not be defined conditionally. The CONFIG_IOMMU_API dependency
check was added in the past to fix a compilation issue back when
the header resided in the arch/arm layers, and is no longer
needed.
While at this, fix the header against double inclusion as well.
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>
Diffstat (limited to 'drivers/iommu/omap-iommu.h')
| -rw-r--r-- | drivers/iommu/omap-iommu.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/iommu/omap-iommu.h b/drivers/iommu/omap-iommu.h index 4fc51c8e24b1..d7c51327cd25 100644 --- a/drivers/iommu/omap-iommu.h +++ b/drivers/iommu/omap-iommu.h @@ -10,6 +10,9 @@ * published by the Free Software Foundation. */ +#ifndef _OMAP_IOMMU_H +#define _OMAP_IOMMU_H + #if defined(CONFIG_ARCH_OMAP1) #error "iommu for this processor not implemented yet" #endif @@ -92,7 +95,6 @@ struct iommu_functions { ssize_t (*dump_ctx)(struct omap_iommu *obj, char *buf, ssize_t len); }; -#ifdef CONFIG_IOMMU_API /** * dev_to_omap_iommu() - retrieves an omap iommu object from a user device * @dev: iommu client device @@ -103,7 +105,6 @@ static inline struct omap_iommu *dev_to_omap_iommu(struct device *dev) return arch_data->iommu_dev; } -#endif /* * MMU Register offsets @@ -220,3 +221,5 @@ static inline void iommu_write_reg(struct omap_iommu *obj, u32 val, size_t offs) { __raw_writel(val, obj->regbase + offs); } + +#endif /* _OMAP_IOMMU_H */ |