diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2007-04-26 15:46:24 +0100 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-04-27 16:20:24 +0100 |
commit | f197465384bf7ef1af184c2ed1a4e268911a91e3 (patch) | |
tree | d5637a3bff89aded9248bdf1cb24230d094d0228 /arch/mips/mips-boards/generic/reset.c | |
parent | 78709b9df35346965b214e0e548412748d147776 (diff) | |
download | linux-f197465384bf7ef1af184c2ed1a4e268911a91e3.tar.gz linux-f197465384bf7ef1af184c2ed1a4e268911a91e3.tar.bz2 linux-f197465384bf7ef1af184c2ed1a4e268911a91e3.zip |
[MIPS] MIPS Tech: Get rid of volatile in core code.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/mips-boards/generic/reset.c')
-rw-r--r-- | arch/mips/mips-boards/generic/reset.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/mips/mips-boards/generic/reset.c b/arch/mips/mips-boards/generic/reset.c index 0996ba368b2a..7a1bb51f81ee 100644 --- a/arch/mips/mips-boards/generic/reset.c +++ b/arch/mips/mips-boards/generic/reset.c @@ -39,24 +39,24 @@ static void atlas_machine_power_off(void); 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) { - 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) 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 |