提交 8aa0f413 编写于 作者: T Tejun Heo

floppy: don't use flush_scheduled_work()

flush_scheduled_work() is deprecated and scheduled to be removed.
Directly flush floppy_work instead.
Signed-off-by: NTejun Heo <tj@kernel.org>
Cc: Jens Axboe <axboe@kernel.dk>
上级 539253f6
...@@ -4352,7 +4352,7 @@ static int __init floppy_init(void) ...@@ -4352,7 +4352,7 @@ static int __init floppy_init(void)
out_unreg_platform_dev: out_unreg_platform_dev:
platform_device_unregister(&floppy_device[drive]); platform_device_unregister(&floppy_device[drive]);
out_flush_work: out_flush_work:
flush_scheduled_work(); flush_work_sync(&floppy_work);
if (atomic_read(&usage_count)) if (atomic_read(&usage_count))
floppy_release_irq_and_dma(); floppy_release_irq_and_dma();
out_unreg_region: out_unreg_region:
...@@ -4422,7 +4422,7 @@ static int floppy_grab_irq_and_dma(void) ...@@ -4422,7 +4422,7 @@ static int floppy_grab_irq_and_dma(void)
* We might have scheduled a free_irq(), wait it to * We might have scheduled a free_irq(), wait it to
* drain first: * drain first:
*/ */
flush_scheduled_work(); flush_work_sync(&floppy_work);
if (fd_request_irq()) { if (fd_request_irq()) {
DPRINT("Unable to grab IRQ%d for the floppy driver\n", DPRINT("Unable to grab IRQ%d for the floppy driver\n",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册