Commit 0f198890 authored by Fabian Frederick's avatar Fabian Frederick Committed by Joerg Roedel

iommu/omap: Use PAGE_ALIGNED instead of IS_ALIGNED(PAGE_SIZE)

use mm.h definition

Cc: Joerg Roedel <joro@8bytes.org>
Cc: iommu@lists.linux-foundation.org
Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 4c834452
...@@ -131,7 +131,7 @@ static unsigned sgtable_nents(size_t bytes, u32 da, u32 pa) ...@@ -131,7 +131,7 @@ static unsigned sgtable_nents(size_t bytes, u32 da, u32 pa)
{ {
unsigned nr_entries = 0, ent_sz; unsigned nr_entries = 0, ent_sz;
if (!IS_ALIGNED(bytes, PAGE_SIZE)) { if (!PAGE_ALIGNED(bytes)) {
pr_err("%s: wrong size %08x\n", __func__, bytes); pr_err("%s: wrong size %08x\n", __func__, bytes);
return 0; return 0;
} }
...@@ -159,7 +159,7 @@ static struct sg_table *sgtable_alloc(const size_t bytes, u32 flags, ...@@ -159,7 +159,7 @@ static struct sg_table *sgtable_alloc(const size_t bytes, u32 flags,
if (!bytes) if (!bytes)
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
if (!IS_ALIGNED(bytes, PAGE_SIZE)) if (!PAGE_ALIGNED(bytes))
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
if (flags & IOVMF_LINEAR) { if (flags & IOVMF_LINEAR) {
...@@ -514,7 +514,7 @@ static void unmap_iovm_area(struct iommu_domain *domain, struct omap_iommu *obj, ...@@ -514,7 +514,7 @@ static void unmap_iovm_area(struct iommu_domain *domain, struct omap_iommu *obj,
size_t unmapped; size_t unmapped;
BUG_ON(!sgtable_ok(sgt)); BUG_ON(!sgtable_ok(sgt));
BUG_ON((!total) || !IS_ALIGNED(total, PAGE_SIZE)); BUG_ON((!total) || !PAGE_ALIGNED(total));
start = area->da_start; start = area->da_start;
for_each_sg(sgt->sgl, sg, sgt->nents, i) { for_each_sg(sgt->sgl, sg, sgt->nents, i) {
...@@ -529,7 +529,7 @@ static void unmap_iovm_area(struct iommu_domain *domain, struct omap_iommu *obj, ...@@ -529,7 +529,7 @@ static void unmap_iovm_area(struct iommu_domain *domain, struct omap_iommu *obj,
dev_dbg(obj->dev, "%s: unmap %08x(%x) %08x\n", dev_dbg(obj->dev, "%s: unmap %08x(%x) %08x\n",
__func__, start, bytes, area->flags); __func__, start, bytes, area->flags);
BUG_ON(!IS_ALIGNED(bytes, PAGE_SIZE)); BUG_ON(!PAGE_ALIGNED(bytes));
total -= bytes; total -= bytes;
start += bytes; start += bytes;
...@@ -545,7 +545,7 @@ static struct sg_table *unmap_vm_area(struct iommu_domain *domain, ...@@ -545,7 +545,7 @@ static struct sg_table *unmap_vm_area(struct iommu_domain *domain,
struct sg_table *sgt = NULL; struct sg_table *sgt = NULL;
struct iovm_struct *area; struct iovm_struct *area;
if (!IS_ALIGNED(da, PAGE_SIZE)) { if (!PAGE_ALIGNED(da)) {
dev_err(obj->dev, "%s: alignment err(%08x)\n", __func__, da); dev_err(obj->dev, "%s: alignment err(%08x)\n", __func__, da);
return NULL; return NULL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment