diff options
author | Tejun Heo <tj@kernel.org> | 2010-12-24 09:59:06 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2010-12-24 09:59:06 -0500 |
commit | fe413ec322e26179c788c678f24434b94cca34f0 (patch) | |
tree | e4df7b6bab57dd6f91cd99ffc8fdcb20755fde4f /arch/arm/mach-pxa/sharpsl_pm.c | |
parent | 5d8e4bddc635dd61ab8b3bcb75c59934e9c1e19f (diff) |
arm/sharpsl: don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed.
Directly flush toggle_charger and sharpsl_bat works on suspend
instead.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Russell King <linux@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa/sharpsl_pm.c')
-rw-r--r-- | arch/arm/mach-pxa/sharpsl_pm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c index 8fed027b12dc..e68d46d415f3 100644 --- a/arch/arm/mach-pxa/sharpsl_pm.c +++ b/arch/arm/mach-pxa/sharpsl_pm.c | |||
@@ -579,7 +579,8 @@ static int sharpsl_ac_check(void) | |||
579 | static int sharpsl_pm_suspend(struct platform_device *pdev, pm_message_t state) | 579 | static int sharpsl_pm_suspend(struct platform_device *pdev, pm_message_t state) |
580 | { | 580 | { |
581 | sharpsl_pm.flags |= SHARPSL_SUSPENDED; | 581 | sharpsl_pm.flags |= SHARPSL_SUSPENDED; |
582 | flush_scheduled_work(); | 582 | flush_delayed_work_sync(&toggle_charger); |
583 | flush_delayed_work_sync(&sharpsl_bat); | ||
583 | 584 | ||
584 | if (sharpsl_pm.charge_mode == CHRG_ON) | 585 | if (sharpsl_pm.charge_mode == CHRG_ON) |
585 | sharpsl_pm.flags |= SHARPSL_DO_OFFLINE_CHRG; | 586 | sharpsl_pm.flags |= SHARPSL_DO_OFFLINE_CHRG; |