lib/powerpc: addrmap_phys_to_virt() should return a pointer

addrmap_phys_to_virt() converts a physical address (phys_addr_t) to a
virtual address, so it should return a pointer instead of an unsigned long.
Its counterpart, addrmap_virt_to_phys(), takes a pointer, so now they're
orthogonal.

The only caller of addrmap_phys_to_virt() converts the return value to
a pointer anyway.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>

diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h
index 56ac9fe6c534b2f08d69ac0b3610252bd8b60a7b..6b52a94ffbdbd060fff7e247e9b14f4d79d7fcea 100644 (file)
--- a/arch/powerpc/include/asm/io.h
+++ b/arch/powerpc/include/asm/io.h
@@ -295,7 +295,7 @@ static inline void *
 map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)
 {
 #ifdef CONFIG_ADDR_MAP
-       return (void *)(addrmap_phys_to_virt(paddr));
+       return addrmap_phys_to_virt(paddr);
 #else
        return (void *)((unsigned long)paddr);
 #endif

diff --git a/include/addr_map.h b/include/addr_map.h
index d55f5f64e10d0123982ed7fe9fad0889451ce5cd..dda4d6e710dfa864c4df04745c9753a826ca8b7c 100644 (file)
--- a/include/addr_map.h
+++ b/include/addr_map.h
@@ -22,7 +22,7 @@
 #include <asm/types.h>
 
 extern phys_addr_t addrmap_virt_to_phys(void *vaddr);
-extern unsigned long addrmap_phys_to_virt(phys_addr_t paddr);
+extern void *addrmap_phys_to_virt(phys_addr_t paddr);
 extern void addrmap_set_entry(unsigned long vaddr, phys_addr_t paddr,
                                phys_size_t size, int idx);
 

diff --git a/lib/addr_map.c b/lib/addr_map.c
index ff8532cf1528f037dbab39952c78cc6b8424db58..31384d13984323f0bf624beaa9b2751a17e6ef8b 100644 (file)
--- a/lib/addr_map.c
+++ b/lib/addr_map.c
@@ -47,26 +47,29 @@ phys_addr_t addrmap_virt_to_phys(void * vaddr)
        return (phys_addr_t)(~0);
 }
 
-unsigned long addrmap_phys_to_virt(phys_addr_t paddr)
+void *addrmap_phys_to_virt(phys_addr_t paddr)
 {
        int i;
 
        for (i = 0; i < CONFIG_SYS_NUM_ADDR_MAP; i++) {
-               u64 base, upper, addr;
+               phys_addr_t base, upper;
 
                if (address_map[i].size == 0)
                        continue;
 
-               addr = (u64)paddr;
-               base = (u64)(address_map[i].paddr);
-               upper = (u64)(address_map[i].size) + base - 1;
+               base = address_map[i].paddr;
+               upper = address_map[i].size + base - 1;
 
-               if (addr >= base && addr <= upper) {
-                       return paddr - address_map[i].paddr + address_map[i].vaddr;
+               if (paddr >= base && paddr <= upper) {
+                       phys_addr_t offset;
+
+                       offset = address_map[i].paddr - address_map[i].vaddr;
+
+                       return (void *)(unsigned long)(paddr - offset);
                }
        }
 
-       return (unsigned long)(~0);
+       return (void *)(~0);
 }
 
 void addrmap_set_entry(unsigned long vaddr, phys_addr_t paddr,