[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>

diff --git a/arch/arm/common/sharpsl_pm.c b/arch/arm/common/sharpsl_pm.c
index 3bf3a927ae22fbb4d09586ce0d55f88bb5f5dcd9..62cb50816cc674655be18324ac1c83a005845081 100644 (file)
--- 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 6bf15ae73848efc667689d28661944e00a84d167..6d86203aef7b410203e0558ba1c34a4a24e09e6c 100644 (file)
--- 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 7a8a1cdf430ddaaf80d1bf9939b5975fa49d9e7b..52243a62c4e76de36fbe21f8aa10d4846684e283 100644 (file)
--- 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);