diff options
| author | Tejun Heo | 2012-08-21 22:18:24 +0200 |
|---|---|---|
| committer | Tejun Heo | 2012-08-21 22:18:24 +0200 |
| commit | 136b5721d75a62a8f02c601c89122e32c1a85a84 (patch) | |
| tree | 871be0290b244d7e171ee615faecd6b804c55f8e /drivers/block/floppy.c | |
| parent | workqueue: reimplement cancel_delayed_work() using try_to_grab_pending() (diff) | |
| download | kernel-qcow2-linux-136b5721d75a62a8f02c601c89122e32c1a85a84.tar.gz kernel-qcow2-linux-136b5721d75a62a8f02c601c89122e32c1a85a84.tar.xz kernel-qcow2-linux-136b5721d75a62a8f02c601c89122e32c1a85a84.zip | |
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 'drivers/block/floppy.c')
| -rw-r--r-- | drivers/block/floppy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 55a5bc002c06..17c675c52295 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -890,7 +890,7 @@ static void unlock_fdc(void) raw_cmd = NULL; command_status = FD_COMMAND_NONE; - __cancel_delayed_work(&fd_timeout); + cancel_delayed_work(&fd_timeout); do_floppy = NULL; cont = NULL; clear_bit(0, &fdc_busy); |