diff options
| author | Tan Xiaojun <tanxiaojun@huawei.com> | 2014-02-15 13:19:51 +0800 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2017-12-05 18:05:58 +0100 |
| commit | 9d13af96d5e85a218255c150f036021e306d2730 (patch) | |
| tree | d2093d8b4286c512b05c0b1d9a02e5df7e15435f | |
| parent | 24e3d0b0ff3af9a8a95cb0f32f18a0ac97f747c5 (diff) | |
workqueue: Remove deprecated __cancel_delayed_work()
__cancel_delayed_work() was deprecated by 136b5721d75a ("workqueue:
deprecate __cancel_delayed_work()") as cancel_delayed_work() was
updated so that it could be used from all contexts. Enough time has
passed since the deprecation. Let's remove it.
tj: description update
Signed-off-by: Tan Xiaojun <tanxiaojun@huawei.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
| -rw-r--r-- | include/linux/workqueue.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index 8dc29a126..fa20ca630 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h @@ -620,21 +620,6 @@ static inline bool keventd_up(void) return system_wq != NULL; } -/* - * Like above, but uses del_timer() instead of del_timer_sync(). This means, - * if it returns 0 the timer function may be running and the queueing is in - * progress. - */ -static inline bool __deprecated __cancel_delayed_work(struct delayed_work *work) -{ - bool ret; - - ret = del_timer(&work->timer); - if (ret) - work_clear_pending(&work->work); - return ret; -} - /* used to be different but now identical to flush_work(), deprecated */ static inline bool __deprecated flush_work_sync(struct work_struct *work) { |