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>

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 6c2f55e05f13c31675bcbcbc70d6254e2d70783d..4ff47deb86da090510a7899567d50fd3ee330cfc 100644 (file)
--- 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@linux-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@kernel.org>
+
+----------------------------

diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index 0c0771f06bfa745e8e4e5add4ec4823cf52eb813..6b5193d70268111ed99655589070286865c40814 100644 (file)
--- 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);