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-ds1305.c | |
parent | 0d9ee5b2e9aac981fa063339daf04320eac610d1 (diff) | |
download | op-kernel-dev-9db8995be5e1869b5effa117909bc285e06fc09b.zip op-kernel-dev-9db8995be5e1869b5effa117909bc285e06fc09b.tar.gz |
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-ds1305.c')
-rw-r--r-- | drivers/rtc/rtc-ds1305.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-ds1305.c b/drivers/rtc/rtc-ds1305.c index 48da85e..077af1d 100644 --- a/drivers/rtc/rtc-ds1305.c +++ b/drivers/rtc/rtc-ds1305.c @@ -813,7 +813,7 @@ static int __devexit ds1305_remove(struct spi_device *spi) if (spi->irq) { set_bit(FLAG_EXITING, &ds1305->flags); free_irq(spi->irq, ds1305); - flush_scheduled_work(); + cancel_work_sync(&ds1305->work); } rtc_device_unregister(ds1305->rtc); |