diff options
| author | Tejun Heo <tj@kernel.org> | 2012-08-22 00:18:24 +0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2012-08-22 00:18:24 +0400 |
| commit | 136b5721d75a62a8f02c601c89122e32c1a85a84 (patch) | |
| tree | 871be0290b244d7e171ee615faecd6b804c55f8e /block | |
| parent | 57b30ae77bf00d2318df711ef9a4d2a9be0a3a2a (diff) | |
| download | linux-136b5721d75a62a8f02c601c89122e32c1a85a84.tar.xz | |
workqueue: deprecate __cancel_delayed_work()
Now that cancel_delayed_work() can be safely called from IRQ handlers,
there's no reason to use __cancel_delayed_work(). Use
cancel_delayed_work() instead of __cancel_delayed_work() and mark the
latter deprecated.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Jens Axboe <axboe@kernel.dk>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Roland Dreier <roland@kernel.org>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 4b8b606dbb01..dc04a9013027 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -262,7 +262,7 @@ EXPORT_SYMBOL(blk_start_queue); **/ void blk_stop_queue(struct request_queue *q) { - __cancel_delayed_work(&q->delay_work); + cancel_delayed_work(&q->delay_work); queue_flag_set(QUEUE_FLAG_STOPPED, q); } EXPORT_SYMBOL(blk_stop_queue); |