diff options
-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 | |||
564 | Who: Jean Delvare <khali@linux-fr.org> | 564 | Who: Jean Delvare <khali@linux-fr.org> |
565 | 565 | ||
566 | ---------------------------- | 566 | ---------------------------- |
567 | |||
568 | What: cancel_rearming_delayed_work[queue]() | ||
569 | When: 2.6.39 | ||
570 | |||
571 | Why: The functions have been superceded by cancel_delayed_work_sync() | ||
572 | quite some time ago. The conversion is trivial and there is no | ||
573 | in-kernel user left. | ||
574 | Who: Tejun Heo <tj@kernel.org> | ||
575 | |||
576 | ---------------------------- | ||
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) | |||
401 | } | 401 | } |
402 | 402 | ||
403 | /* Obsolete. use cancel_delayed_work_sync() */ | 403 | /* Obsolete. use cancel_delayed_work_sync() */ |
404 | static inline | 404 | static inline __deprecated |
405 | void cancel_rearming_delayed_workqueue(struct workqueue_struct *wq, | 405 | void cancel_rearming_delayed_workqueue(struct workqueue_struct *wq, |
406 | struct delayed_work *work) | 406 | struct delayed_work *work) |
407 | { | 407 | { |
@@ -409,7 +409,7 @@ void cancel_rearming_delayed_workqueue(struct workqueue_struct *wq, | |||
409 | } | 409 | } |
410 | 410 | ||
411 | /* Obsolete. use cancel_delayed_work_sync() */ | 411 | /* Obsolete. use cancel_delayed_work_sync() */ |
412 | static inline | 412 | static inline __deprecated |
413 | void cancel_rearming_delayed_work(struct delayed_work *work) | 413 | void cancel_rearming_delayed_work(struct delayed_work *work) |
414 | { | 414 | { |
415 | cancel_delayed_work_sync(work); | 415 | cancel_delayed_work_sync(work); |