diff options
author | Robert P. J. Day <rpjday@mindspring.com> | 2007-05-25 14:32:28 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-07-10 12:32:56 -0400 |
commit | b3f6df9f21c6efc4641613188204aa0742bc9e22 (patch) | |
tree | 377d574d3757c58852a106dae7b3454db300205f /arch/mips/sgi-ip22 | |
parent | 8f8771a057bff0d3911459d0bdadf03ec1dd3c89 (diff) |
[MIPS] Transform old-style macros to newer "__noreturn"
Convert old/obsolete NORET_TYPE and ATTRIB_NORET macros to use the
newer standard of "__noreturn" as defined in compiler-gcc.h.
Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/sgi-ip22')
-rw-r--r-- | arch/mips/sgi-ip22/ip22-reset.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/sgi-ip22/ip22-reset.c b/arch/mips/sgi-ip22/ip22-reset.c index 66df5ac8f089..63afd7e44428 100644 --- a/arch/mips/sgi-ip22/ip22-reset.c +++ b/arch/mips/sgi-ip22/ip22-reset.c | |||
@@ -46,7 +46,7 @@ static struct timer_list power_timer, blink_timer, debounce_timer, volume_timer; | |||
46 | 46 | ||
47 | static int machine_state; | 47 | static int machine_state; |
48 | 48 | ||
49 | static void ATTRIB_NORET sgi_machine_power_off(void) | 49 | static void __noreturn sgi_machine_power_off(void) |
50 | { | 50 | { |
51 | unsigned int tmp; | 51 | unsigned int tmp; |
52 | 52 | ||
@@ -68,7 +68,7 @@ static void ATTRIB_NORET sgi_machine_power_off(void) | |||
68 | } | 68 | } |
69 | } | 69 | } |
70 | 70 | ||
71 | static void ATTRIB_NORET sgi_machine_restart(char *command) | 71 | static void __noreturn sgi_machine_restart(char *command) |
72 | { | 72 | { |
73 | if (machine_state & MACHINE_SHUTTING_DOWN) | 73 | if (machine_state & MACHINE_SHUTTING_DOWN) |
74 | sgi_machine_power_off(); | 74 | sgi_machine_power_off(); |
@@ -76,7 +76,7 @@ static void ATTRIB_NORET sgi_machine_restart(char *command) | |||
76 | while (1); | 76 | while (1); |
77 | } | 77 | } |
78 | 78 | ||
79 | static void ATTRIB_NORET sgi_machine_halt(void) | 79 | static void __noreturn sgi_machine_halt(void) |
80 | { | 80 | { |
81 | if (machine_state & MACHINE_SHUTTING_DOWN) | 81 | if (machine_state & MACHINE_SHUTTING_DOWN) |
82 | sgi_machine_power_off(); | 82 | sgi_machine_power_off(); |