diff options
-rw-r--r-- | include/asm-blackfin/io.h | 2 | ||||
-rw-r--r-- | include/asm-h8300/io.h | 2 | ||||
-rw-r--r-- | include/asm-h8300/virtconvert.h | 2 | ||||
-rw-r--r-- | include/asm-m68knommu/io.h | 2 | ||||
-rw-r--r-- | include/asm-v850/io.h | 2 |
5 files changed, 0 insertions, 10 deletions
diff --git a/include/asm-blackfin/io.h b/include/asm-blackfin/io.h index 1601d62f39a5..574fe56989d1 100644 --- a/include/asm-blackfin/io.h +++ b/include/asm-blackfin/io.h | |||
@@ -188,8 +188,6 @@ extern void blkfin_inv_cache_all(void); | |||
188 | #define page_to_phys(page) ((page - mem_map) << PAGE_SHIFT) | 188 | #define page_to_phys(page) ((page - mem_map) << PAGE_SHIFT) |
189 | #define page_to_bus(page) ((page - mem_map) << PAGE_SHIFT) | 189 | #define page_to_bus(page) ((page - mem_map) << PAGE_SHIFT) |
190 | 190 | ||
191 | #define mm_ptov(vaddr) ((void *) (vaddr)) | ||
192 | #define mm_vtop(vaddr) ((unsigned long) (vaddr)) | ||
193 | #define phys_to_virt(vaddr) ((void *) (vaddr)) | 191 | #define phys_to_virt(vaddr) ((void *) (vaddr)) |
194 | #define virt_to_phys(vaddr) ((unsigned long) (vaddr)) | 192 | #define virt_to_phys(vaddr) ((unsigned long) (vaddr)) |
195 | 193 | ||
diff --git a/include/asm-h8300/io.h b/include/asm-h8300/io.h index 7543a57b4ea1..26dc6ccd9441 100644 --- a/include/asm-h8300/io.h +++ b/include/asm-h8300/io.h | |||
@@ -302,8 +302,6 @@ static __inline__ void ctrl_outl(unsigned long b, unsigned long addr) | |||
302 | /* | 302 | /* |
303 | * Macros used for converting between virtual and physical mappings. | 303 | * Macros used for converting between virtual and physical mappings. |
304 | */ | 304 | */ |
305 | #define mm_ptov(vaddr) ((void *) (vaddr)) | ||
306 | #define mm_vtop(vaddr) ((unsigned long) (vaddr)) | ||
307 | #define phys_to_virt(vaddr) ((void *) (vaddr)) | 305 | #define phys_to_virt(vaddr) ((void *) (vaddr)) |
308 | #define virt_to_phys(vaddr) ((unsigned long) (vaddr)) | 306 | #define virt_to_phys(vaddr) ((unsigned long) (vaddr)) |
309 | 307 | ||
diff --git a/include/asm-h8300/virtconvert.h b/include/asm-h8300/virtconvert.h index ee7d5ea10065..19cfd62b11c3 100644 --- a/include/asm-h8300/virtconvert.h +++ b/include/asm-h8300/virtconvert.h | |||
@@ -10,8 +10,6 @@ | |||
10 | #include <asm/setup.h> | 10 | #include <asm/setup.h> |
11 | #include <asm/page.h> | 11 | #include <asm/page.h> |
12 | 12 | ||
13 | #define mm_ptov(vaddr) ((void *) (vaddr)) | ||
14 | #define mm_vtop(vaddr) ((unsigned long) (vaddr)) | ||
15 | #define phys_to_virt(vaddr) ((void *) (vaddr)) | 13 | #define phys_to_virt(vaddr) ((void *) (vaddr)) |
16 | #define virt_to_phys(vaddr) ((unsigned long) (vaddr)) | 14 | #define virt_to_phys(vaddr) ((unsigned long) (vaddr)) |
17 | 15 | ||
diff --git a/include/asm-m68knommu/io.h b/include/asm-m68knommu/io.h index 653d9b2d7ddf..6adef1ee2082 100644 --- a/include/asm-m68knommu/io.h +++ b/include/asm-m68knommu/io.h | |||
@@ -172,8 +172,6 @@ extern void iounmap(void *addr); | |||
172 | /* | 172 | /* |
173 | * Macros used for converting between virtual and physical mappings. | 173 | * Macros used for converting between virtual and physical mappings. |
174 | */ | 174 | */ |
175 | #define mm_ptov(vaddr) ((void *) (vaddr)) | ||
176 | #define mm_vtop(vaddr) ((unsigned long) (vaddr)) | ||
177 | #define phys_to_virt(vaddr) ((void *) (vaddr)) | 175 | #define phys_to_virt(vaddr) ((void *) (vaddr)) |
178 | #define virt_to_phys(vaddr) ((unsigned long) (vaddr)) | 176 | #define virt_to_phys(vaddr) ((unsigned long) (vaddr)) |
179 | 177 | ||
diff --git a/include/asm-v850/io.h b/include/asm-v850/io.h index cc364fcbec10..cdad251fba9f 100644 --- a/include/asm-v850/io.h +++ b/include/asm-v850/io.h | |||
@@ -122,8 +122,6 @@ outsl (unsigned long port, const void *src, unsigned long count) | |||
122 | #endif | 122 | #endif |
123 | 123 | ||
124 | /* Conversion between virtual and physical mappings. */ | 124 | /* Conversion between virtual and physical mappings. */ |
125 | #define mm_ptov(addr) ((void *)__phys_to_virt (addr)) | ||
126 | #define mm_vtop(addr) ((unsigned long)__virt_to_phys (addr)) | ||
127 | #define phys_to_virt(addr) ((void *)__phys_to_virt (addr)) | 125 | #define phys_to_virt(addr) ((void *)__phys_to_virt (addr)) |
128 | #define virt_to_phys(addr) ((unsigned long)__virt_to_phys (addr)) | 126 | #define virt_to_phys(addr) ((unsigned long)__virt_to_phys (addr)) |
129 | 127 | ||