* [PATCH] workqueue: Remove unused __cancel_delayed_work
@ 2014-02-15 5:19 Tan Xiaojun
2014-02-18 23:34 ` [PATCH wq/for-3.15] workqueue: Remove deprecated __cancel_delayed_work() Tejun Heo
0 siblings, 1 reply; 2+ messages in thread
From: Tan Xiaojun @ 2014-02-15 5:19 UTC (permalink / raw)
To: tj; +Cc: linux-kernel
We use safer cancel_delayed_work() instead of __cancel_delayed_work,
and no one will use __cancel_delayed_work. So remove it.
Signed-off-by: Tan Xiaojun <tanxiaojun@huawei.com>
---
include/linux/workqueue.h | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index 594521b..edc9410 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)
{
--
1.8.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH wq/for-3.15] workqueue: Remove deprecated __cancel_delayed_work()
2014-02-15 5:19 [PATCH] workqueue: Remove unused __cancel_delayed_work Tan Xiaojun
@ 2014-02-18 23:34 ` Tejun Heo
0 siblings, 0 replies; 2+ messages in thread
From: Tejun Heo @ 2014-02-18 23:34 UTC (permalink / raw)
To: Tan Xiaojun; +Cc: linux-kernel
Hello, Tan.
The description didn't seem to give enough details so I applied with
updated description.
Thanks a lot!
------ 8< ------
>From 90d88bd75424dff51e2072fd2f8fa85ee893aa17 Mon Sep 17 00:00:00 2001
From: Tan Xiaojun <tanxiaojun@huawei.com>
Date: Sat, 15 Feb 2014 13:19:51 +0800
__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>
---
include/linux/workqueue.h | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index 594521b..edc9410 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)
{
--
1.8.5.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-02-18 23:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-15 5:19 [PATCH] workqueue: Remove unused __cancel_delayed_work Tan Xiaojun
2014-02-18 23:34 ` [PATCH wq/for-3.15] workqueue: Remove deprecated __cancel_delayed_work() Tejun Heo
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.