aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/workqueue.h
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2010-12-14 10:23:10 -0500
committerTejun Heo <tj@kernel.org>2010-12-15 04:57:22 -0500
commited41390fa57a21d06e6e3a3c4bc238bab8957fbb (patch)
tree40fe4c692a4cf70e5a037fabff21ffa39999be81 /include/linux/workqueue.h
parentafe2c511fb2d75f1515081ff1be15bd79cfe722d (diff)
workqueue: deprecate cancel_rearming_delayed_work[queue]()
There's no in-kernel user left for these two obsolete functions. Mark them deprecated and schedule for removal during 2.6.39 cycle. Signed-off-by: Tejun Heo <tj@kernel.org> Acked-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/workqueue.h')
-rw-r--r--include/linux/workqueue.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index 0c0771f06bfa..6b5193d70268 100644
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
@@ -401,7 +401,7 @@ static inline bool __cancel_delayed_work(struct delayed_work *work)
401} 401}
402 402
403/* Obsolete. use cancel_delayed_work_sync() */ 403/* Obsolete. use cancel_delayed_work_sync() */
404static inline 404static inline __deprecated
405void cancel_rearming_delayed_workqueue(struct workqueue_struct *wq, 405void cancel_rearming_delayed_workqueue(struct workqueue_struct *wq,
406 struct delayed_work *work) 406 struct delayed_work *work)
407{ 407{
@@ -409,7 +409,7 @@ void cancel_rearming_delayed_workqueue(struct workqueue_struct *wq,
409} 409}
410 410
411/* Obsolete. use cancel_delayed_work_sync() */ 411/* Obsolete. use cancel_delayed_work_sync() */
412static inline 412static inline __deprecated
413void cancel_rearming_delayed_work(struct delayed_work *work) 413void cancel_rearming_delayed_work(struct delayed_work *work)
414{ 414{
415 cancel_delayed_work_sync(work); 415 cancel_delayed_work_sync(work);