arm/sharpsl: don't use flush_scheduled_work()
authorTejun Heo <tj@kernel.org>
Fri, 24 Dec 2010 14:59:06 +0000 (15:59 +0100)
committerTejun Heo <tj@kernel.org>
Fri, 24 Dec 2010 14:59:06 +0000 (15:59 +0100)
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>
arch/arm/mach-pxa/sharpsl_pm.c

index 8fed027..e68d46d 100644 (file)
@@ -579,7 +579,8 @@ static int sharpsl_ac_check(void)
 static int sharpsl_pm_suspend(struct platform_device *pdev, pm_message_t state)
 {
        sharpsl_pm.flags |= SHARPSL_SUSPENDED;
-       flush_scheduled_work();
+       flush_delayed_work_sync(&toggle_charger);
+       flush_delayed_work_sync(&sharpsl_bat);
 
        if (sharpsl_pm.charge_mode == CHRG_ON)
                sharpsl_pm.flags |= SHARPSL_DO_OFFLINE_CHRG;