Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f62c3f2c35874713ebbb6b6a4b9d9c6caaed4f14 Commit: f62c3f2c35874713ebbb6b6a4b9d9c6caaed4f14 Parent: 7dcca30a32aadb0520417521b0c44f42d09fe05c Author: Russell King <[EMAIL PROTECTED]> AuthorDate: Tue May 15 11:03:24 2007 +0100 Committer: Russell King <[EMAIL PROTECTED]> CommitDate: Thu Jul 12 14:27:53 2007 +0100
[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 <[EMAIL PROTECTED]> --- arch/arm/common/sharpsl_pm.c | 1 - arch/arm/mach-pxa/pm.c | 11 ----------- 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 3bf3a92..62cb508 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 6bf15ae..6d86203 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 7a8a1cd..52243a6 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); - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html