Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f62c3f2c authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 7dcca30a

arch/arm/common/sharpsl_pm.c

+0 −1
Original line number Diff line number Diff line
@@ -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,

};

arch/arm/mach-pxa/pm.c

+0 −11
Original line number Diff line number Diff line
@@ -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,

};

include/asm-arm/arch-pxa/pm.h

+0 −1
Original line number Diff line number Diff line
@@ -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);