* [PATCH 1/1] drivers/iommu/omap-iovmm.c: use PAGE_ALIGNED instead of IS_ALIGNED(PAGE_SIZE
@ 2014-06-14 21:58 Fabian Frederick
2014-07-04 10:40 ` Joerg Roedel
0 siblings, 1 reply; 2+ messages in thread
From: Fabian Frederick @ 2014-06-14 21:58 UTC (permalink / raw)
To: linux-kernel; +Cc: Fabian Frederick, Joerg Roedel, iommu
use mm.h definition
Cc: Joerg Roedel <joro@8bytes.org>
Cc: iommu@lists.linux-foundation.org
Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
drivers/iommu/omap-iovmm.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/iommu/omap-iovmm.c b/drivers/iommu/omap-iovmm.c
index d147259..f583ba0 100644
--- a/drivers/iommu/omap-iovmm.c
+++ b/drivers/iommu/omap-iovmm.c
@@ -131,7 +131,7 @@ static unsigned sgtable_nents(size_t bytes, u32 da, u32 pa)
{
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);
return 0;
}
@@ -159,7 +159,7 @@ static struct sg_table *sgtable_alloc(const size_t bytes, u32 flags,
if (!bytes)
return ERR_PTR(-EINVAL);
- if (!IS_ALIGNED(bytes, PAGE_SIZE))
+ if (!PAGE_ALIGNED(bytes))
return ERR_PTR(-EINVAL);
if (flags & IOVMF_LINEAR) {
@@ -514,7 +514,7 @@ static void unmap_iovm_area(struct iommu_domain *domain, struct omap_iommu *obj,
size_t unmapped;
BUG_ON(!sgtable_ok(sgt));
- BUG_ON((!total) || !IS_ALIGNED(total, PAGE_SIZE));
+ BUG_ON((!total) || !PAGE_ALIGNED(total));
start = area->da_start;
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,
dev_dbg(obj->dev, "%s: unmap %08x(%x) %08x\n",
__func__, start, bytes, area->flags);
- BUG_ON(!IS_ALIGNED(bytes, PAGE_SIZE));
+ BUG_ON(!PAGE_ALIGNED(bytes));
total -= bytes;
start += bytes;
@@ -545,7 +545,7 @@ static struct sg_table *unmap_vm_area(struct iommu_domain *domain,
struct sg_table *sgt = NULL;
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);
return NULL;
}
--
1.8.4.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/1] drivers/iommu/omap-iovmm.c: use PAGE_ALIGNED instead of IS_ALIGNED(PAGE_SIZE
2014-06-14 21:58 [PATCH 1/1] drivers/iommu/omap-iovmm.c: use PAGE_ALIGNED instead of IS_ALIGNED(PAGE_SIZE Fabian Frederick
@ 2014-07-04 10:40 ` Joerg Roedel
0 siblings, 0 replies; 2+ messages in thread
From: Joerg Roedel @ 2014-07-04 10:40 UTC (permalink / raw)
To: Fabian Frederick; +Cc: linux-kernel, iommu
On Sat, Jun 14, 2014 at 11:58:34PM +0200, Fabian Frederick wrote:
> use mm.h definition
>
> Cc: Joerg Roedel <joro@8bytes.org>
> Cc: iommu@lists.linux-foundation.org
> Signed-off-by: Fabian Frederick <fabf@skynet.be>
> ---
> drivers/iommu/omap-iovmm.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
Applied to arm/omap, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-07-04 10:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-14 21:58 [PATCH 1/1] drivers/iommu/omap-iovmm.c: use PAGE_ALIGNED instead of IS_ALIGNED(PAGE_SIZE Fabian Frederick
2014-07-04 10:40 ` Joerg Roedel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).