leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MIPS] MIPS Tech: Get rid of volatile in core code.

Browse Source 
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Ralf Baechle 2007-04-26 15:46:24 +01:00
parent 78709b9df3
commit f197465384
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/mips/mips-boards/generic/display.c
View File

@ -24,16 +24,16 @@
void mips_display_message(const char *str) void mips_display_message(const char *str)
{ {
static volatile unsigned int *display = NULL; static unsigned int __iomem *display = NULL;
int i; int i;
if (unlikely(display == NULL)) if (unlikely(display == NULL))
display = (volatile unsigned int *)ioremap(ASCII_DISPLAY_POS_BASE, 16*sizeof(int)); display = ioremap(ASCII_DISPLAY_POS_BASE, 16*sizeof(int));
for (i = 0; i <= 14; i=i+2) { for (i = 0; i <= 14; i=i+2) {
if (*str) if (*str)
display[i] = *str++; writel(*str++, display + i);
else else
display[i] = ' '; writel(' ', display + i);
} }
} }

12
arch/mips/mips-boards/generic/reset.c
View File

@ -39,24 +39,24 @@ static void atlas_machine_power_off(void);
static void mips_machine_restart(char *command) static void mips_machine_restart(char *command)
{ {
volatile unsigned int *softres_reg = (unsigned int *)ioremap (SOFTRES_REG, sizeof(unsigned int)); unsigned int __iomem *softres_reg = ioremap(SOFTRES_REG, sizeof(unsigned int));
*softres_reg = GORESET; writew(GORESET, softres_reg);
} }
static void mips_machine_halt(void) static void mips_machine_halt(void)
{ {
volatile unsigned int *softres_reg = (unsigned int *)ioremap (SOFTRES_REG, sizeof(unsigned int)); unsigned int __iomem *softres_reg = ioremap(SOFTRES_REG, sizeof(unsigned int));
*softres_reg = GORESET; writew(GORESET, softres_reg);
} }
#if defined(CONFIG_MIPS_ATLAS) #if defined(CONFIG_MIPS_ATLAS)
static void atlas_machine_power_off(void) static void atlas_machine_power_off(void)
{ {
volatile unsigned int *psustby_reg = (unsigned int *)ioremap(ATLAS_PSUSTBY_REG, sizeof(unsigned int)); unsigned int __iomem *psustby_reg = ioremap(ATLAS_PSUSTBY_REG, sizeof(unsigned int));
*psustby_reg = ATLAS_GOSTBY; writew(ATLAS_GOSTBY, psustby_reg);
} }
#endif #endif

2
arch/mips/mips-boards/malta/malta_int.c
View File

@ -85,7 +85,7 @@ static inline int mips_pcibios_iack(void)
dummy = BONITO_PCIMAP_CFG; dummy = BONITO_PCIMAP_CFG;
iob(); /* sync */ iob(); /* sync */
irq = *(volatile u32 *)(_pcictrl_bonito_pcicfg); irq = readl((u32 *)_pcictrl_bonito_pcicfg);
iob(); /* sync */ iob(); /* sync */
irq &= 0xff; irq &= 0xff;
BONITO_PCIMAP_CFG = 0; BONITO_PCIMAP_CFG = 0;

4
arch/mips/mips-boards/malta/malta_setup.c
View File

@ -145,7 +145,8 @@ void __init plat_mem_setup(void)
#ifdef CONFIG_BLK_DEV_IDE #ifdef CONFIG_BLK_DEV_IDE
/* Check PCI clock */ /* Check PCI clock */
{ {
int jmpr = (*((volatile unsigned int *)ioremap(MALTA_JMPRS_REG, sizeof(unsigned int))) >> 2) & 0x07; unsigned int __iomem *jmpr_p = (unsigned int *) ioremap(MALTA_JMPRS_REG, sizeof(unsigned int));
int jmpr = (readw(jmpr_p) >> 2) & 0x07;
static const int pciclocks[] __initdata = { static const int pciclocks[] __initdata = {
33, 20, 25, 30, 12, 16, 37, 10 33, 20, 25, 30, 12, 16, 37, 10
}; };
@ -179,7 +180,6 @@ void __init plat_mem_setup(void)
}; };
#endif #endif
#endif #endif
mips_reboot_setup(); mips_reboot_setup();
board_time_init = mips_time_init; board_time_init = mips_time_init;