GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-20 22:21:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

avr32: Remove second definition of virt_to_phys()

Browse source 
The second definition introduced by 65e43a1063 conflicts with the
existing one.

Also, convert the existing definition to use phys_addr_t. The volatile
qualifier is still needed due to brain damage elsewhere.

Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
This commit is contained in:
Haavard Skinnemoen 2008-12-17 16:43:18 +01:00
parent aced78d852
commit 92c78a3bbc
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
include/asm-avr32/io.h
View file

@ -76,12 +76,12 @@ extern void __readwrite_bug(const char *fn);
#include <asm/addrspace.h> #include <asm/addrspace.h>
/* virt_to_phys will only work when address is in P1 or P2 */ /* virt_to_phys will only work when address is in P1 or P2 */
static __inline__ unsigned long virt_to_phys(volatile void *address) static inline phys_addr_t virt_to_phys(volatile void *address)
{ {
return PHYSADDR(address); return PHYSADDR(address);
} }
static __inline__ void * phys_to_virt(unsigned long address) static inline void *phys_to_virt(phys_addr_t address)
{ {
return (void *)P1SEGADDR(address); return (void *)P1SEGADDR(address);
} }
@ -125,9 +125,4 @@ static inline void unmap_physmem(void *vaddr, unsigned long len)
} }
static inline phys_addr_t virt_to_phys(void * vaddr)
{
return (phys_addr_t)(vaddr);
}
#endif /* __ASM_AVR32_IO_H */ #endif /* __ASM_AVR32_IO_H */