summaryrefslogtreecommitdiff
path: root/include/linux/workqueue.h
diff options
context:
space:
mode:
authorTan Xiaojun <tanxiaojun@huawei.com>2014-02-15 13:19:51 +0800
committerTejun Heo <tj@kernel.org>2014-02-18 18:29:01 -0500
commit90d88bd75424dff51e2072fd2f8fa85ee893aa17 (patch)
treecd26fe18567d6f13d95a563c16ad7840ddbd74f8 /include/linux/workqueue.h
parent38dbfb59d1175ef458d006556061adeaa8751b72 (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>
Diffstat (limited to 'include/linux/workqueue.h')
-rw-r--r--include/linux/workqueue.h15
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)
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)
{