diff options
-rw-r--r-- | arch/arm/common/sharpsl_pm.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-pxa/pm.c | 11 | ||||
-rw-r--r-- | include/asm-arm/arch-pxa/pm.h | 1 |
3 files changed, 0 insertions, 13 deletions
diff --git a/arch/arm/common/sharpsl_pm.c b/arch/arm/common/sharpsl_pm.c index 3bf3a927ae22..62cb50816cc6 100644 --- a/arch/arm/common/sharpsl_pm.c +++ b/arch/arm/common/sharpsl_pm.c | |||
@@ -768,7 +768,6 @@ static void sharpsl_apm_get_power_status(struct apm_power_info *info) | |||
768 | static struct pm_ops sharpsl_pm_ops = { | 768 | static struct pm_ops sharpsl_pm_ops = { |
769 | .prepare = pxa_pm_prepare, | 769 | .prepare = pxa_pm_prepare, |
770 | .enter = corgi_pxa_pm_enter, | 770 | .enter = corgi_pxa_pm_enter, |
771 | .finish = pxa_pm_finish, | ||
772 | .valid = pm_valid_only_mem, | 771 | .valid = pm_valid_only_mem, |
773 | }; | 772 | }; |
774 | 773 | ||
diff --git a/arch/arm/mach-pxa/pm.c b/arch/arm/mach-pxa/pm.c index 6bf15ae73848..6d86203aef7b 100644 --- a/arch/arm/mach-pxa/pm.c +++ b/arch/arm/mach-pxa/pm.c | |||
@@ -213,20 +213,9 @@ int pxa_pm_prepare(suspend_state_t state) | |||
213 | 213 | ||
214 | EXPORT_SYMBOL_GPL(pxa_pm_prepare); | 214 | EXPORT_SYMBOL_GPL(pxa_pm_prepare); |
215 | 215 | ||
216 | /* | ||
217 | * Called after devices are re-setup, but before processes are thawed. | ||
218 | */ | ||
219 | int pxa_pm_finish(suspend_state_t state) | ||
220 | { | ||
221 | return 0; | ||
222 | } | ||
223 | |||
224 | EXPORT_SYMBOL_GPL(pxa_pm_finish); | ||
225 | |||
226 | static struct pm_ops pxa_pm_ops = { | 216 | static struct pm_ops pxa_pm_ops = { |
227 | .prepare = pxa_pm_prepare, | 217 | .prepare = pxa_pm_prepare, |
228 | .enter = pxa_pm_enter, | 218 | .enter = pxa_pm_enter, |
229 | .finish = pxa_pm_finish, | ||
230 | .valid = pm_valid_only_mem, | 219 | .valid = pm_valid_only_mem, |
231 | }; | 220 | }; |
232 | 221 | ||
diff --git a/include/asm-arm/arch-pxa/pm.h b/include/asm-arm/arch-pxa/pm.h index 7a8a1cdf430d..52243a62c4e7 100644 --- a/include/asm-arm/arch-pxa/pm.h +++ b/include/asm-arm/arch-pxa/pm.h | |||
@@ -9,4 +9,3 @@ | |||
9 | 9 | ||
10 | extern int pxa_pm_prepare(suspend_state_t state); | 10 | extern int pxa_pm_prepare(suspend_state_t state); |
11 | extern int pxa_pm_enter(suspend_state_t state); | 11 | extern int pxa_pm_enter(suspend_state_t state); |
12 | extern int pxa_pm_finish(suspend_state_t state); | ||