diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-05-15 11:03:24 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-07-12 14:27:53 +0100 |
| commit | f62c3f2c35874713ebbb6b6a4b9d9c6caaed4f14 (patch) | |
| tree | cddad98c3e62817e4899e5349ea7b8566f4f5e04 | |
| parent | 7dcca30a32aadb0520417521b0c44f42d09fe05c (diff) | |
| download | linux-3.10-f62c3f2c35874713ebbb6b6a4b9d9c6caaed4f14.tar.gz linux-3.10-f62c3f2c35874713ebbb6b6a4b9d9c6caaed4f14.tar.bz2 linux-3.10-f62c3f2c35874713ebbb6b6a4b9d9c6caaed4f14.zip | |
[ARM] pxa: remove useless pxa_pm_finish() function
pxa_pm_finish() does nothing but return zero. The core code
does nothing with this return value, and will not try to call
the finish method in the pm_ops structure if it is NULL.
Therefore, we can remove this useless function.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -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 3bf3a927ae2..62cb50816cc 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) static struct pm_ops sharpsl_pm_ops = { .prepare = pxa_pm_prepare, .enter = corgi_pxa_pm_enter, - .finish = pxa_pm_finish, .valid = pm_valid_only_mem, }; diff --git a/arch/arm/mach-pxa/pm.c b/arch/arm/mach-pxa/pm.c index 6bf15ae7384..6d86203aef7 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) EXPORT_SYMBOL_GPL(pxa_pm_prepare); -/* - * Called after devices are re-setup, but before processes are thawed. - */ -int pxa_pm_finish(suspend_state_t state) -{ - return 0; -} - -EXPORT_SYMBOL_GPL(pxa_pm_finish); - static struct pm_ops pxa_pm_ops = { .prepare = pxa_pm_prepare, .enter = pxa_pm_enter, - .finish = pxa_pm_finish, .valid = pm_valid_only_mem, }; diff --git a/include/asm-arm/arch-pxa/pm.h b/include/asm-arm/arch-pxa/pm.h index 7a8a1cdf430..52243a62c4e 100644 --- a/include/asm-arm/arch-pxa/pm.h +++ b/include/asm-arm/arch-pxa/pm.h @@ -9,4 +9,3 @@ extern int pxa_pm_prepare(suspend_state_t state); extern int pxa_pm_enter(suspend_state_t state); -extern int pxa_pm_finish(suspend_state_t state); |