From: Adrian Bunk This patch removes the unused mm_{ptov,vtop}(). Signed-off-by: Adrian Bunk Acked-by: Greg Ungerer Acked-by: Bryan Wu Cc: Miles Bader Cc: Yoshinori Sato Signed-off-by: Andrew Morton --- include/asm-blackfin/io.h | 2 -- include/asm-h8300/io.h | 2 -- include/asm-h8300/virtconvert.h | 2 -- include/asm-m68knommu/io.h | 2 -- include/asm-v850/io.h | 2 -- 5 files changed, 10 deletions(-) diff -puN include/asm-blackfin/io.h~remove-mm_ptovvtop include/asm-blackfin/io.h --- a/include/asm-blackfin/io.h~remove-mm_ptovvtop +++ a/include/asm-blackfin/io.h @@ -188,8 +188,6 @@ extern void blkfin_inv_cache_all(void); #define page_to_phys(page) ((page - mem_map) << PAGE_SHIFT) #define page_to_bus(page) ((page - mem_map) << PAGE_SHIFT) -#define mm_ptov(vaddr) ((void *) (vaddr)) -#define mm_vtop(vaddr) ((unsigned long) (vaddr)) #define phys_to_virt(vaddr) ((void *) (vaddr)) #define virt_to_phys(vaddr) ((unsigned long) (vaddr)) diff -puN include/asm-h8300/io.h~remove-mm_ptovvtop include/asm-h8300/io.h --- a/include/asm-h8300/io.h~remove-mm_ptovvtop +++ a/include/asm-h8300/io.h @@ -302,8 +302,6 @@ static __inline__ void ctrl_outl(unsigne /* * Macros used for converting between virtual and physical mappings. */ -#define mm_ptov(vaddr) ((void *) (vaddr)) -#define mm_vtop(vaddr) ((unsigned long) (vaddr)) #define phys_to_virt(vaddr) ((void *) (vaddr)) #define virt_to_phys(vaddr) ((unsigned long) (vaddr)) diff -puN include/asm-h8300/virtconvert.h~remove-mm_ptovvtop include/asm-h8300/virtconvert.h --- a/include/asm-h8300/virtconvert.h~remove-mm_ptovvtop +++ a/include/asm-h8300/virtconvert.h @@ -10,8 +10,6 @@ #include #include -#define mm_ptov(vaddr) ((void *) (vaddr)) -#define mm_vtop(vaddr) ((unsigned long) (vaddr)) #define phys_to_virt(vaddr) ((void *) (vaddr)) #define virt_to_phys(vaddr) ((unsigned long) (vaddr)) diff -puN include/asm-m68knommu/io.h~remove-mm_ptovvtop include/asm-m68knommu/io.h --- a/include/asm-m68knommu/io.h~remove-mm_ptovvtop +++ a/include/asm-m68knommu/io.h @@ -172,8 +172,6 @@ extern void iounmap(void *addr); /* * Macros used for converting between virtual and physical mappings. */ -#define mm_ptov(vaddr) ((void *) (vaddr)) -#define mm_vtop(vaddr) ((unsigned long) (vaddr)) #define phys_to_virt(vaddr) ((void *) (vaddr)) #define virt_to_phys(vaddr) ((unsigned long) (vaddr)) diff -puN include/asm-v850/io.h~remove-mm_ptovvtop include/asm-v850/io.h --- a/include/asm-v850/io.h~remove-mm_ptovvtop +++ a/include/asm-v850/io.h @@ -122,8 +122,6 @@ outsl (unsigned long port, const void *s #endif /* Conversion between virtual and physical mappings. */ -#define mm_ptov(addr) ((void *)__phys_to_virt (addr)) -#define mm_vtop(addr) ((unsigned long)__virt_to_phys (addr)) #define phys_to_virt(addr) ((void *)__phys_to_virt (addr)) #define virt_to_phys(addr) ((unsigned long)__virt_to_phys (addr)) _