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

Commit 40998188 authored by Ohad Ben-Cohen's avatar Ohad Ben-Cohen Committed by Joerg Roedel
Browse files

iommu/core: use the existing IS_ALIGNED macro 



Replace iommu's alignment checks with the existing IS_ALIGNED macro,
to drop a few lines of code and utilize IS_ALIGNED's type safety.

Signed-off-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
parent 403f81d8

drivers/iommu/iommu.c

+3 −6
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA

 */



#include <linux/kernel.h>

#include <linux/bug.h>

#include <linux/types.h>

#include <linux/module.h>
@@ -97,13 +98,11 @@ EXPORT_SYMBOL_GPL(iommu_domain_has_cap); 
int iommu_map(struct iommu_domain *domain, unsigned long iova,

	      phys_addr_t paddr, int gfp_order, int prot)

{

	unsigned long invalid_mask;

	size_t size;



	size         = 0x1000UL << gfp_order;

	invalid_mask = size - 1;



	BUG_ON((iova | paddr) & invalid_mask);

	BUG_ON(!IS_ALIGNED(iova | paddr, size));



	return iommu_ops->map(domain, iova, paddr, gfp_order, prot);

}
@@ -111,13 +110,11 @@ EXPORT_SYMBOL_GPL(iommu_map); 


int iommu_unmap(struct iommu_domain *domain, unsigned long iova, int gfp_order)

{

	unsigned long invalid_mask;

	size_t size;



	size         = 0x1000UL << gfp_order;

	invalid_mask = size - 1;



	BUG_ON(iova & invalid_mask);

	BUG_ON(!IS_ALIGNED(iova, size));



	return iommu_ops->unmap(domain, iova, gfp_order);

}