aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2010-12-24 09:59:06 -0500
committerTejun Heo <tj@kernel.org>2010-12-24 09:59:06 -0500
commit8aa0f413848708bca329c52358ae7a1a0e395b4e (patch)
tree5bcc9480f60b9d992b4e5c457497c586d5fe2ff6 /drivers
parent539253f6e13feedfa7bb6a3112c6707ebdf11e74 (diff)
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: Tejun Heo <tj@kernel.org> Cc: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/block/floppy.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 3951020e494a..25e4dffa0aad 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -4352,7 +4352,7 @@ static int __init floppy_init(void)
4352out_unreg_platform_dev: 4352out_unreg_platform_dev:
4353 platform_device_unregister(&floppy_device[drive]); 4353 platform_device_unregister(&floppy_device[drive]);
4354out_flush_work: 4354out_flush_work:
4355 flush_scheduled_work(); 4355 flush_work_sync(&floppy_work);
4356 if (atomic_read(&usage_count)) 4356 if (atomic_read(&usage_count))
4357 floppy_release_irq_and_dma(); 4357 floppy_release_irq_and_dma();
4358out_unreg_region: 4358out_unreg_region:
@@ -4422,7 +4422,7 @@ static int floppy_grab_irq_and_dma(void)
4422 * We might have scheduled a free_irq(), wait it to 4422 * We might have scheduled a free_irq(), wait it to
4423 * drain first: 4423 * drain first:
4424 */ 4424 */
4425 flush_scheduled_work(); 4425 flush_work_sync(&floppy_work);
4426 4426
4427 if (fd_request_irq()) { 4427 if (fd_request_irq()) {
4428 DPRINT("Unable to grab IRQ%d for the floppy driver\n", 4428 DPRINT("Unable to grab IRQ%d for the floppy driver\n",