diff options
author | Tejun Heo <tj@kernel.org> | 2010-12-11 17:51:45 +0100 |
---|---|---|
committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2010-12-22 02:39:56 +0300 |
commit | bc51e7ff521f28a7f14dc2f25307ad9101d1305a (patch) | |
tree | 011477cb2e90d2038261170a4e688f795d6720f9 /drivers/power/wm97xx_battery.c | |
parent | 3a2dbd611b38cf9a026c0099a85701ad183d1949 (diff) | |
download | kernel_goldelico_gta04-bc51e7ff521f28a7f14dc2f25307ad9101d1305a.zip kernel_goldelico_gta04-bc51e7ff521f28a7f14dc2f25307ad9101d1305a.tar.gz kernel_goldelico_gta04-bc51e7ff521f28a7f14dc2f25307ad9101d1305a.tar.bz2 |
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/wm97xx_battery.c')
-rw-r--r-- | drivers/power/wm97xx_battery.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/wm97xx_battery.c b/drivers/power/wm97xx_battery.c index 5071d85..156559e 100644 --- a/drivers/power/wm97xx_battery.c +++ b/drivers/power/wm97xx_battery.c @@ -147,7 +147,7 @@ static irqreturn_t wm97xx_chrg_irq(int irq, void *data) #ifdef CONFIG_PM static int wm97xx_bat_suspend(struct device *dev) { - flush_scheduled_work(); + flush_work_sync(&bat_work); return 0; } @@ -273,7 +273,7 @@ static int __devexit wm97xx_bat_remove(struct platform_device *dev) free_irq(gpio_to_irq(pdata->charge_gpio), dev); gpio_free(pdata->charge_gpio); } - flush_scheduled_work(); + cancel_work_sync(&bat_work); power_supply_unregister(&bat_ps); kfree(prop); return 0; |