diff options
Diffstat (limited to 'drivers/acpi/sleep')
-rw-r--r-- | drivers/acpi/sleep/main.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c index 3271850a1f35..c58dd0bb5506 100644 --- a/drivers/acpi/sleep/main.c +++ b/drivers/acpi/sleep/main.c | |||
@@ -85,13 +85,12 @@ static int acpi_pm_set_target(suspend_state_t pm_state) | |||
85 | 85 | ||
86 | /** | 86 | /** |
87 | * acpi_pm_prepare - Do preliminary suspend work. | 87 | * acpi_pm_prepare - Do preliminary suspend work. |
88 | * @pm_state: ignored | ||
89 | * | 88 | * |
90 | * If necessary, set the firmware waking vector and do arch-specific | 89 | * If necessary, set the firmware waking vector and do arch-specific |
91 | * nastiness to get the wakeup code to the waking vector. | 90 | * nastiness to get the wakeup code to the waking vector. |
92 | */ | 91 | */ |
93 | 92 | ||
94 | static int acpi_pm_prepare(suspend_state_t pm_state) | 93 | static int acpi_pm_prepare(void) |
95 | { | 94 | { |
96 | int error = acpi_sleep_prepare(acpi_target_sleep_state); | 95 | int error = acpi_sleep_prepare(acpi_target_sleep_state); |
97 | 96 | ||
@@ -160,13 +159,12 @@ static int acpi_pm_enter(suspend_state_t pm_state) | |||
160 | 159 | ||
161 | /** | 160 | /** |
162 | * acpi_pm_finish - Finish up suspend sequence. | 161 | * acpi_pm_finish - Finish up suspend sequence. |
163 | * @pm_state: ignored | ||
164 | * | 162 | * |
165 | * This is called after we wake back up (or if entering the sleep state | 163 | * This is called after we wake back up (or if entering the sleep state |
166 | * failed). | 164 | * failed). |
167 | */ | 165 | */ |
168 | 166 | ||
169 | static int acpi_pm_finish(suspend_state_t pm_state) | 167 | static void acpi_pm_finish(void) |
170 | { | 168 | { |
171 | u32 acpi_state = acpi_target_sleep_state; | 169 | u32 acpi_state = acpi_target_sleep_state; |
172 | 170 | ||
@@ -184,7 +182,6 @@ static int acpi_pm_finish(suspend_state_t pm_state) | |||
184 | init_8259A(0); | 182 | init_8259A(0); |
185 | } | 183 | } |
186 | #endif | 184 | #endif |
187 | return 0; | ||
188 | } | 185 | } |
189 | 186 | ||
190 | static int acpi_pm_state_valid(suspend_state_t pm_state) | 187 | static int acpi_pm_state_valid(suspend_state_t pm_state) |