summaryrefslogtreecommitdiffstats
path: root/drivers/rtc/rtc-ds3232.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2010-12-24 16:00:17 +0100
committerTejun Heo <tj@kernel.org>2010-12-24 16:00:17 +0100
commit9db8995be5e1869b5effa117909bc285e06fc09b (patch)
tree199efc5fdf5f79dbee8532b0aa8e8e8a296bb193 /drivers/rtc/rtc-ds3232.c
parent0d9ee5b2e9aac981fa063339daf04320eac610d1 (diff)
downloadlinux-9db8995be5e1869b5effa117909bc285e06fc09b.tar.bz2
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-ds3232.c')
-rw-r--r--drivers/rtc/rtc-ds3232.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-ds3232.c b/drivers/rtc/rtc-ds3232.c
index 57063552d3b7..23a9ee19764c 100644
--- a/drivers/rtc/rtc-ds3232.c
+++ b/drivers/rtc/rtc-ds3232.c
@@ -463,7 +463,7 @@ static int __devexit ds3232_remove(struct i2c_client *client)
mutex_unlock(&ds3232->mutex);
free_irq(client->irq, client);
- flush_scheduled_work();
+ cancel_work_sync(&ds3232->work);
}
rtc_device_unregister(ds3232->rtc);