diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2007-04-26 10:46:24 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-04-27 11:20:24 -0400 |
commit | f197465384bf7ef1af184c2ed1a4e268911a91e3 (patch) | |
tree | d5637a3bff89aded9248bdf1cb24230d094d0228 /arch/mips/mips-boards/generic/reset.c | |
parent | 78709b9df35346965b214e0e548412748d147776 (diff) |
[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); | |||
39 | 39 | ||
40 | static void mips_machine_restart(char *command) | 40 | static void mips_machine_restart(char *command) |
41 | { | 41 | { |
42 | volatile unsigned int *softres_reg = (unsigned int *)ioremap (SOFTRES_REG, sizeof(unsigned int)); | 42 | unsigned int __iomem *softres_reg = ioremap(SOFTRES_REG, sizeof(unsigned int)); |
43 | 43 | ||
44 | *softres_reg = GORESET; | 44 | writew(GORESET, softres_reg); |
45 | } | 45 | } |
46 | 46 | ||
47 | static void mips_machine_halt(void) | 47 | static void mips_machine_halt(void) |
48 | { | 48 | { |
49 | volatile unsigned int *softres_reg = (unsigned int *)ioremap (SOFTRES_REG, sizeof(unsigned int)); | 49 | unsigned int __iomem *softres_reg = ioremap(SOFTRES_REG, sizeof(unsigned int)); |
50 | 50 | ||
51 | *softres_reg = GORESET; | 51 | writew(GORESET, softres_reg); |
52 | } | 52 | } |
53 | 53 | ||
54 | #if defined(CONFIG_MIPS_ATLAS) | 54 | #if defined(CONFIG_MIPS_ATLAS) |
55 | static void atlas_machine_power_off(void) | 55 | static void atlas_machine_power_off(void) |
56 | { | 56 | { |
57 | volatile unsigned int *psustby_reg = (unsigned int *)ioremap(ATLAS_PSUSTBY_REG, sizeof(unsigned int)); | 57 | unsigned int __iomem *psustby_reg = ioremap(ATLAS_PSUSTBY_REG, sizeof(unsigned int)); |
58 | 58 | ||
59 | *psustby_reg = ATLAS_GOSTBY; | 59 | writew(ATLAS_GOSTBY, psustby_reg); |
60 | } | 60 | } |
61 | #endif | 61 | #endif |
62 | 62 | ||