diff options
| author | Tejun Heo <tj@kernel.org> | 2010-12-14 16:23:10 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-12-15 10:57:22 +0100 |
| commit | ed41390fa57a21d06e6e3a3c4bc238bab8957fbb (patch) | |
| tree | 40fe4c692a4cf70e5a037fabff21ffa39999be81 | |
| parent | afe2c511fb2d75f1515081ff1be15bd79cfe722d (diff) | |
| download | blackbird-op-linux-ed41390fa57a21d06e6e3a3c4bc238bab8957fbb.tar.gz blackbird-op-linux-ed41390fa57a21d06e6e3a3c4bc238bab8957fbb.zip | |
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>
| -rw-r--r-- | Documentation/feature-removal-schedule.txt | 10 | ||||
| -rw-r--r-- | 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 6c2f55e05f13..4ff47deb86da 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@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 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) } /* 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); |
