diff options
author | Tan Xiaojun <tanxiaojun@huawei.com> | 2014-02-15 00:19:51 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2014-02-18 18:29:01 -0500 |
commit | 90d88bd75424dff51e2072fd2f8fa85ee893aa17 (patch) | |
tree | cd26fe18567d6f13d95a563c16ad7840ddbd74f8 | |
parent | 38dbfb59d1175ef458d006556061adeaa8751b72 (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 594521ba0d43..edc941049d79 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h | |||
@@ -605,21 +605,6 @@ static inline bool keventd_up(void) | |||
605 | return system_wq != NULL; | 605 | return system_wq != NULL; |
606 | } | 606 | } |
607 | 607 | ||
608 | /* | ||
609 | * Like above, but uses del_timer() instead of del_timer_sync(). This means, | ||
610 | * if it returns 0 the timer function may be running and the queueing is in | ||
611 | * progress. | ||
612 | */ | ||
613 | static inline bool __deprecated __cancel_delayed_work(struct delayed_work *work) | ||
614 | { | ||
615 | bool ret; | ||
616 | |||
617 | ret = del_timer(&work->timer); | ||
618 | if (ret) | ||
619 | work_clear_pending(&work->work); | ||
620 | return ret; | ||
621 | } | ||
622 | |||
623 | /* used to be different but now identical to flush_work(), deprecated */ | 608 | /* used to be different but now identical to flush_work(), deprecated */ |
624 | static inline bool __deprecated flush_work_sync(struct work_struct *work) | 609 | static inline bool __deprecated flush_work_sync(struct work_struct *work) |
625 | { | 610 | { |