diff options
| author |   Tejun Heo <tj@kernel.org> | 2010-12-24 16:00:17 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-12-24 16:00:17 +0100 |
| commit | 9db8995be5e1869b5effa117909bc285e06fc09b (patch) | |
| tree | 199efc5fdf5f79dbee8532b0aa8e8e8a296bb193 /drivers/rtc/rtc-ds1374.c | |
| parent | mmc: update workqueue usages (diff) | |
| download | linux-dev-9db8995be5e1869b5effa117909bc285e06fc09b.tar.xz linux-dev-9db8995be5e1869b5effa117909bc285e06fc09b.zip | |
rtc: don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed. On
removal, directly cancel the work, and flush the uie_task in
rtc-dev.c::clear_uie().
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: rtc-linux@googlegroups.com
Diffstat (limited to 'drivers/rtc/rtc-ds1374.c')
| -rw-r--r-- | drivers/rtc/rtc-ds1374.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-ds1374.c b/drivers/rtc/rtc-ds1374.c index 1f0007fd4431..47fb6357c346 100644 --- a/drivers/rtc/rtc-ds1374.c +++ b/drivers/rtc/rtc-ds1374.c @@ -417,7 +417,7 @@ static int __devexit ds1374_remove(struct i2c_client *client) mutex_unlock(&ds1374->mutex); free_irq(client->irq, client); - flush_scheduled_work(); + cancel_work_sync(&ds1374->work); } rtc_device_unregister(ds1374->rtc); |