diff options
| author | Amerigo Wang <amwang@redhat.com> | 2011-04-06 10:43:11 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-05-20 13:45:38 +0200 |
| commit | 2543a87108d2af7d48a43b3d6685c2b1ea279e36 (patch) | |
| tree | 78564be5e5a1ffe7834621ff2fba4dff1c394286 | |
| parent | 257313b2a87795e07a0bdf58d0fffbdba8b31051 (diff) | |
workqueue: remove cancel_rearming_delayed_work[queue]()
cancel_rearming_delayed_work() and cancel_rearming_delayed_workqueue()
can be removed now.
Signed-off-by: WANG Cong <amwang@redhat.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
| -rw-r--r-- | Documentation/feature-removal-schedule.txt | 10 | ||||
| -rw-r--r-- | include/linux/workqueue.h | 15 |
2 files changed, 0 insertions, 25 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index f6a24e8aa11..e472054382c 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt @@ -513,16 +513,6 @@ Who: NeilBrown <neilb@suse.de> ---------------------------- -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> - ----------------------------- - What: Legacy, non-standard chassis intrusion detection interface. When: June 2011 Why: The adm9240, w83792d and w83793 hardware monitoring drivers have diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index f584aba78ca..57b31b3d83b 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h @@ -412,21 +412,6 @@ static inline bool __cancel_delayed_work(struct delayed_work *work) return ret; } -/* Obsolete. use cancel_delayed_work_sync() */ -static inline __deprecated -void cancel_rearming_delayed_workqueue(struct workqueue_struct *wq, - struct delayed_work *work) -{ - cancel_delayed_work_sync(work); -} - -/* Obsolete. use cancel_delayed_work_sync() */ -static inline __deprecated -void cancel_rearming_delayed_work(struct delayed_work *work) -{ - cancel_delayed_work_sync(work); -} - #ifndef CONFIG_SMP static inline long work_on_cpu(unsigned int cpu, long (*fn)(void *), void *arg) { |