diff options
author | Len Brown <len.brown@intel.com> | 2008-04-23 18:02:52 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-04-29 10:15:27 -0400 |
commit | 2c6e33c366bff2f839df60d9235ff09143e28dd9 (patch) | |
tree | 0c97b7ff16df039af106ee5de4921b042e67145f /drivers/acpi/sleep | |
parent | e7ae1e7ef9b4ef50444a49611dab92cb778eb97c (diff) |
ACPI: re-name acpi_pm_ops to acpi_suspend_ops
... as they are platform_suspend_ops after all.
cosmetic re-name only, no functional change.
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/sleep')
-rw-r--r-- | drivers/acpi/sleep/main.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c index 71183eea790..c3b0cd88d09 100644 --- a/drivers/acpi/sleep/main.c +++ b/drivers/acpi/sleep/main.c | |||
@@ -51,7 +51,7 @@ static int acpi_sleep_prepare(u32 acpi_state) | |||
51 | } | 51 | } |
52 | 52 | ||
53 | #ifdef CONFIG_SUSPEND | 53 | #ifdef CONFIG_SUSPEND |
54 | static struct platform_suspend_ops acpi_pm_ops; | 54 | static struct platform_suspend_ops acpi_suspend_ops; |
55 | 55 | ||
56 | extern void do_suspend_lowlevel(void); | 56 | extern void do_suspend_lowlevel(void); |
57 | 57 | ||
@@ -65,11 +65,11 @@ static u32 acpi_suspend_states[] = { | |||
65 | static int init_8259A_after_S1; | 65 | static int init_8259A_after_S1; |
66 | 66 | ||
67 | /** | 67 | /** |
68 | * acpi_pm_begin - Set the target system sleep state to the state | 68 | * acpi_suspend_begin - Set the target system sleep state to the state |
69 | * associated with given @pm_state, if supported. | 69 | * associated with given @pm_state, if supported. |
70 | */ | 70 | */ |
71 | 71 | ||
72 | static int acpi_pm_begin(suspend_state_t pm_state) | 72 | static int acpi_suspend_begin(suspend_state_t pm_state) |
73 | { | 73 | { |
74 | u32 acpi_state = acpi_suspend_states[pm_state]; | 74 | u32 acpi_state = acpi_suspend_states[pm_state]; |
75 | int error = 0; | 75 | int error = 0; |
@@ -85,13 +85,13 @@ static int acpi_pm_begin(suspend_state_t pm_state) | |||
85 | } | 85 | } |
86 | 86 | ||
87 | /** | 87 | /** |
88 | * acpi_pm_prepare - Do preliminary suspend work. | 88 | * acpi_suspend_prepare - Do preliminary suspend work. |
89 | * | 89 | * |
90 | * If necessary, set the firmware waking vector and do arch-specific | 90 | * If necessary, set the firmware waking vector and do arch-specific |
91 | * nastiness to get the wakeup code to the waking vector. | 91 | * nastiness to get the wakeup code to the waking vector. |
92 | */ | 92 | */ |
93 | 93 | ||
94 | static int acpi_pm_prepare(void) | 94 | static int acpi_suspend_prepare(void) |
95 | { | 95 | { |
96 | int error = acpi_sleep_prepare(acpi_target_sleep_state); | 96 | int error = acpi_sleep_prepare(acpi_target_sleep_state); |
97 | 97 | ||
@@ -104,7 +104,7 @@ static int acpi_pm_prepare(void) | |||
104 | } | 104 | } |
105 | 105 | ||
106 | /** | 106 | /** |
107 | * acpi_pm_enter - Actually enter a sleep state. | 107 | * acpi_suspend_enter - Actually enter a sleep state. |
108 | * @pm_state: ignored | 108 | * @pm_state: ignored |
109 | * | 109 | * |
110 | * Flush caches and go to sleep. For STR we have to call arch-specific | 110 | * Flush caches and go to sleep. For STR we have to call arch-specific |
@@ -112,7 +112,7 @@ static int acpi_pm_prepare(void) | |||
112 | * It's unfortunate, but it works. Please fix if you're feeling frisky. | 112 | * It's unfortunate, but it works. Please fix if you're feeling frisky. |
113 | */ | 113 | */ |
114 | 114 | ||
115 | static int acpi_pm_enter(suspend_state_t pm_state) | 115 | static int acpi_suspend_enter(suspend_state_t pm_state) |
116 | { | 116 | { |
117 | acpi_status status = AE_OK; | 117 | acpi_status status = AE_OK; |
118 | unsigned long flags = 0; | 118 | unsigned long flags = 0; |
@@ -169,13 +169,13 @@ static int acpi_pm_enter(suspend_state_t pm_state) | |||
169 | } | 169 | } |
170 | 170 | ||
171 | /** | 171 | /** |
172 | * acpi_pm_finish - Instruct the platform to leave a sleep state. | 172 | * acpi_suspend_finish - Instruct the platform to leave a sleep state. |
173 | * | 173 | * |
174 | * This is called after we wake back up (or if entering the sleep state | 174 | * This is called after we wake back up (or if entering the sleep state |
175 | * failed). | 175 | * failed). |
176 | */ | 176 | */ |
177 | 177 | ||
178 | static void acpi_pm_finish(void) | 178 | static void acpi_suspend_finish(void) |
179 | { | 179 | { |
180 | u32 acpi_state = acpi_target_sleep_state; | 180 | u32 acpi_state = acpi_target_sleep_state; |
181 | 181 | ||
@@ -196,19 +196,19 @@ static void acpi_pm_finish(void) | |||
196 | } | 196 | } |
197 | 197 | ||
198 | /** | 198 | /** |
199 | * acpi_pm_end - Finish up suspend sequence. | 199 | * acpi_suspend_end - Finish up suspend sequence. |
200 | */ | 200 | */ |
201 | 201 | ||
202 | static void acpi_pm_end(void) | 202 | static void acpi_suspend_end(void) |
203 | { | 203 | { |
204 | /* | 204 | /* |
205 | * This is necessary in case acpi_pm_finish() is not called during a | 205 | * This is necessary in case acpi_suspend_finish() is not called during a |
206 | * failing transition to a sleep state. | 206 | * failing transition to a sleep state. |
207 | */ | 207 | */ |
208 | acpi_target_sleep_state = ACPI_STATE_S0; | 208 | acpi_target_sleep_state = ACPI_STATE_S0; |
209 | } | 209 | } |
210 | 210 | ||
211 | static int acpi_pm_state_valid(suspend_state_t pm_state) | 211 | static int acpi_suspend_state_valid(suspend_state_t pm_state) |
212 | { | 212 | { |
213 | u32 acpi_state; | 213 | u32 acpi_state; |
214 | 214 | ||
@@ -224,13 +224,13 @@ static int acpi_pm_state_valid(suspend_state_t pm_state) | |||
224 | } | 224 | } |
225 | } | 225 | } |
226 | 226 | ||
227 | static struct platform_suspend_ops acpi_pm_ops = { | 227 | static struct platform_suspend_ops acpi_suspend_ops = { |
228 | .valid = acpi_pm_state_valid, | 228 | .valid = acpi_suspend_state_valid, |
229 | .begin = acpi_pm_begin, | 229 | .begin = acpi_suspend_begin, |
230 | .prepare = acpi_pm_prepare, | 230 | .prepare = acpi_suspend_prepare, |
231 | .enter = acpi_pm_enter, | 231 | .enter = acpi_suspend_enter, |
232 | .finish = acpi_pm_finish, | 232 | .finish = acpi_suspend_finish, |
233 | .end = acpi_pm_end, | 233 | .end = acpi_suspend_end, |
234 | }; | 234 | }; |
235 | 235 | ||
236 | /* | 236 | /* |
@@ -492,7 +492,7 @@ int __init acpi_sleep_init(void) | |||
492 | } | 492 | } |
493 | } | 493 | } |
494 | 494 | ||
495 | suspend_set_ops(&acpi_pm_ops); | 495 | suspend_set_ops(&acpi_suspend_ops); |
496 | #endif | 496 | #endif |
497 | 497 | ||
498 | #ifdef CONFIG_HIBERNATION | 498 | #ifdef CONFIG_HIBERNATION |