diff options
| author | Tejun Heo <tj@kernel.org> | 2010-12-11 16:51:45 (GMT) |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2010-12-21 23:39:56 (GMT) |
| commit | bc51e7ff521f28a7f14dc2f25307ad9101d1305a (patch) | |
| tree | 011477cb2e90d2038261170a4e688f795d6720f9 /drivers/power/power_supply_core.c | |
| parent | 3a2dbd611b38cf9a026c0099a85701ad183d1949 (diff) | |
| download | linux-bc51e7ff521f28a7f14dc2f25307ad9101d1305a.tar.xz | |
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>
Diffstat (limited to 'drivers/power/power_supply_core.c')
| -rw-r--r-- | drivers/power/power_supply_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c index f06bad0..970f733 100644 --- a/drivers/power/power_supply_core.c +++ b/drivers/power/power_supply_core.c @@ -201,7 +201,7 @@ EXPORT_SYMBOL_GPL(power_supply_register); void power_supply_unregister(struct power_supply *psy) { - flush_scheduled_work(); + cancel_work_sync(&psy->changed_work); power_supply_remove_triggers(psy); device_unregister(psy->dev); } |