Skip to content

Commit

Permalink
workqueue: Remove deprecated __cancel_delayed_work()
Browse files Browse the repository at this point in the history
__cancel_delayed_work() was deprecated by 136b572 ("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>
  • Loading branch information
Tan Xiaojun authored and Tejun Heo committed Feb 18, 2014
1 parent 38dbfb5 commit 90d88bd
Showing 1 changed file with 0 additions and 15 deletions.
15 changes: 0 additions & 15 deletions include/linux/workqueue.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down

0 comments on commit 90d88bd

Please sign in to comment.