summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/iopgtable.h
diff options
context:
space:
mode:
authorHiroshi DOYU2010-05-13 08:46:44 +0200
committerHiroshi DOYU2010-06-29 06:55:05 +0200
commit124933599a11cab4b77a6d79d49312754e8ff88e (patch)
treee630dc4ae8bed950cd1438914525bc01bad30383 /arch/arm/plat-omap/iopgtable.h
parentomap iommu: Introduce iopgd_is_table MACRO (diff)
downloadkernel-qcow2-linux-124933599a11cab4b77a6d79d49312754e8ff88e.tar.gz
kernel-qcow2-linux-124933599a11cab4b77a6d79d49312754e8ff88e.tar.xz
kernel-qcow2-linux-124933599a11cab4b77a6d79d49312754e8ff88e.zip
omap iommu: Rename iopte_[p,v]addr -> iopte_page_[p,v]addr
Follow Linux pagetable accessor name convention. Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Diffstat (limited to 'arch/arm/plat-omap/iopgtable.h')
-rw-r--r--arch/arm/plat-omap/iopgtable.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/iopgtable.h b/arch/arm/plat-omap/iopgtable.h
index f2e6b64cca64..c3e93bb0911f 100644
--- a/arch/arm/plat-omap/iopgtable.h
+++ b/arch/arm/plat-omap/iopgtable.h
@@ -72,12 +72,12 @@
#define iopgd_index(da) (((da) >> IOPGD_SHIFT) & (PTRS_PER_IOPGD - 1))
#define iopgd_offset(obj, da) ((obj)->iopgd + iopgd_index(da))
-#define iopte_paddr(iopgd) (*iopgd & ~((1 << 10) - 1))
-#define iopte_vaddr(iopgd) ((u32 *)phys_to_virt(iopte_paddr(iopgd)))
+#define iopgd_page_paddr(iopgd) (*iopgd & ~((1 << 10) - 1))
+#define iopgd_page_vaddr(iopgd) ((u32 *)phys_to_virt(iopgd_page_paddr(iopgd)))
/* to find an entry in the second-level page table. */
#define iopte_index(da) (((da) >> IOPTE_SHIFT) & (PTRS_PER_IOPTE - 1))
-#define iopte_offset(iopgd, da) (iopte_vaddr(iopgd) + iopte_index(da))
+#define iopte_offset(iopgd, da) (iopgd_page_vaddr(iopgd) + iopte_index(da))
static inline u32 iotlb_init_entry(struct iotlb_entry *e, u32 da, u32 pa,
u32 flags)