From: Tan Xiaojun <tanxiaojun@huawei.com>
To: <tj@kernel.org>
Cc: <linux-kernel@vger.kernel.org>
Subject: [PATCH] workqueue: Remove unused __cancel_delayed_work
Date: Sat, 15 Feb 2014 13:19:51 +0800 [thread overview]
Message-ID: <1392441591-38152-1-git-send-email-tanxiaojun@huawei.com> (raw)
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
next reply other threads:[~2014-02-15 5:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-15 5:19 Tan Xiaojun [this message]
2014-02-18 23:34 ` [PATCH wq/for-3.15] workqueue: Remove deprecated __cancel_delayed_work() Tejun Heo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1392441591-38152-1-git-send-email-tanxiaojun@huawei.com \
--to=tanxiaojun@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®