commit bc51e7ff521f28a7f14dc2f25307ad9101d1305a
author Tejun Heo <tj@kernel.org> Sat Dec 11 17:51:45 2010 +0100
committer Anton Vorontsov <cbouatmailru@gmail.com> Wed Dec 22 02:39:56 2010 +0300
tree 011477cb2e90d2038261170a4e688f795d6720f9
parent 3a2dbd611b38cf9a026c0099a85701ad183d1949

power_supply: Don't use flush_scheduled_work()

flush_scheduled_work() is deprecated and scheduled to be removed.

In battery drivers, the work can be canceled on probe failure and
removal and should be flushed on suspend.  Replace
flush_scheduled_work() usages with direct cancels and flushes.

Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>

drivers/power/intel_mid_battery.c

diff --git a/drivers/power/intel_mid_battery.c b/drivers/power/intel_mid_battery.c
index 2a10cd3..236147c 100644
--- a/drivers/power/intel_mid_battery.c
+++ b/drivers/power/intel_mid_battery.c
@@ -767,7 +767,7 @@
 	power_supply_unregister(&pbi->usb);
 	power_supply_unregister(&pbi->batt);
 
-	flush_scheduled_work();
+	cancel_work_sync(&pbi->handler);
 	kfree(pbi);
 	return 0;
 }