diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2007-09-09 12:54:11 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2007-09-09 12:54:11 +0000 |
| commit | 108723067bbfdf07b376c6f903010f22324d1fbe (patch) | |
| tree | a8a18c30904c2bf71d54b4e47d695eeb828ccacd /target/linux | |
| parent | 187ef4c639ae154f00244d1cf9a722590b8ab5a7 (diff) | |
| download | upstream-108723067bbfdf07b376c6f903010f22324d1fbe.tar.gz upstream-108723067bbfdf07b376c6f903010f22324d1fbe.tar.bz2 upstream-108723067bbfdf07b376c6f903010f22324d1fbe.zip | |
remove volatile derefs
SVN-Revision: 8706
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/adm5120/files/arch/mips/adm5120/prom.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/target/linux/adm5120/files/arch/mips/adm5120/prom.c b/target/linux/adm5120/files/arch/mips/adm5120/prom.c index 2187477d02..c6187b47a7 100644 --- a/target/linux/adm5120/files/arch/mips/adm5120/prom.c +++ b/target/linux/adm5120/files/arch/mips/adm5120/prom.c @@ -28,12 +28,13 @@ #include <linux/string.h> #include <linux/mm.h> +#include <asm/io.h> #include <asm/bootinfo.h> #include <asm/addrspace.h> -#include <asm/mach-adm5120/adm5120_info.h> -#include <asm/mach-adm5120/adm5120_defs.h> -#include <asm/mach-adm5120/adm5120_uart.h> +#include <adm5120_info.h> +#include <adm5120_defs.h> +#include <adm5120_uart.h> #include <prom/cfe.h> #include <prom/generic.h> @@ -252,8 +253,10 @@ static void __init prom_init_cmdline(void) } -#define UART_READ(r) *(volatile u32 *)(KSEG1ADDR(ADM5120_UART0_BASE)+(r)) -#define UART_WRITE(r,v) *(volatile u32 *)(KSEG1ADDR(ADM5120_UART0_BASE)+(r))=(v) +#define UART_READ(r) \ + __raw_readl((void __iomem *)(KSEG1ADDR(ADM5120_UART0_BASE)+(r))) +#define UART_WRITE(r, v) \ + __raw_writel((v), (void __iomem *)(KSEG1ADDR(ADM5120_UART0_BASE)+(r))) void __init prom_putchar(char ch) { |