[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4D078BDE.8060102@kernel.org>
Date: Tue, 14 Dec 2010 16:23:10 +0100
From: Tejun Heo <tj@...nel.org>
To: linux-kernel@...r.kernel.org
CC: jgarzik@...ox.com, benh@...nel.crashing.org, mchehab@...radead.org,
davem@...emloft.net, netdev@...r.kernel.org, cbou@...l.ru,
dwmw2@...radead.org, zbr@...emap.net, gregkh@...e.de,
bfields@...ldses.org, neilb@...e.de, aelder@....com,
xfs-masters@....sgi.com, cl@...ux-foundation.org,
penberg@...helsinki.fi, akpm@...ux-foundation.org,
netfilter-devel@...r.kernel.org, Trond.Myklebust@...app.com,
linux-nfs@...r.kernel.org
Subject: [PATCH 2/2] 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@...nel.org>
---
Documentation/feature-removal-schedule.txt | 10 ++++++++++
include/linux/workqueue.h | 4 ++--
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 6c2f55e..4ff47de 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -564,3 +564,13 @@ Why: This field is deprecated. I2C device drivers shouldn't change their
Who: Jean Delvare <khali@...ux-fr.org>
----------------------------
+
+What: cancel_rearming_delayed_work[queue]()
+When: 2.6.39
+
+Why: The functions have been superceded by cancel_delayed_work_sync()
+ quite some time ago. The conversion is trivial and there is no
+ in-kernel user left.
+Who: Tejun Heo <tj@...nel.org>
+
+----------------------------
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index 0c0771f..6b5193d 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)
}
/* Obsolete. use cancel_delayed_work_sync() */
-static inline
+static inline __deprecated
void cancel_rearming_delayed_workqueue(struct workqueue_struct *wq,
struct delayed_work *work)
{
@@ -409,7 +409,7 @@ void cancel_rearming_delayed_workqueue(struct workqueue_struct *wq,
}
/* Obsolete. use cancel_delayed_work_sync() */
-static inline
+static inline __deprecated
void cancel_rearming_delayed_work(struct delayed_work *work)
{
cancel_delayed_work_sync(work);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists