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

Commit 533b40cc authored by Suman Anna's avatar Suman Anna Committed by Joerg Roedel
Browse files

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: default avatarSuman Anna <s-anna@ti.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 52dad776

drivers/iommu/omap-iommu.h

+5 −2
Original line number Diff line number Diff line
@@ -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 */