Browse Source

[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>
Russell King 18 years ago
parent
commit
f62c3f2c35
3 changed files with 0 additions and 13 deletions
  1. 0 1
      arch/arm/common/sharpsl_pm.c
  2. 0 11
      arch/arm/mach-pxa/pm.c
  3. 0 1
      include/asm-arm/arch-pxa/pm.h

+ 0 - 1
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 = {
 static struct pm_ops sharpsl_pm_ops = {
 	.prepare	= pxa_pm_prepare,
 	.prepare	= pxa_pm_prepare,
 	.enter		= corgi_pxa_pm_enter,
 	.enter		= corgi_pxa_pm_enter,
-	.finish		= pxa_pm_finish,
 	.valid		= pm_valid_only_mem,
 	.valid		= pm_valid_only_mem,
 };
 };
 
 

+ 0 - 11
arch/arm/mach-pxa/pm.c

@@ -213,20 +213,9 @@ int pxa_pm_prepare(suspend_state_t state)
 
 
 EXPORT_SYMBOL_GPL(pxa_pm_prepare);
 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 = {
 static struct pm_ops pxa_pm_ops = {
 	.prepare	= pxa_pm_prepare,
 	.prepare	= pxa_pm_prepare,
 	.enter		= pxa_pm_enter,
 	.enter		= pxa_pm_enter,
-	.finish		= pxa_pm_finish,
 	.valid		= pm_valid_only_mem,
 	.valid		= pm_valid_only_mem,
 };
 };
 
 

+ 0 - 1
include/asm-arm/arch-pxa/pm.h

@@ -9,4 +9,3 @@
 
 
 extern int pxa_pm_prepare(suspend_state_t state);
 extern int pxa_pm_prepare(suspend_state_t state);
 extern int pxa_pm_enter(suspend_state_t state);
 extern int pxa_pm_enter(suspend_state_t state);
-extern int pxa_pm_finish(suspend_state_t state);