Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8aa0f413 authored by Tejun Heo's avatar Tejun Heo
Browse files

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: default avatarTejun Heo <tj@kernel.org>
Cc: Jens Axboe <axboe@kernel.dk>
parent 539253f6

drivers/block/floppy.c

+2 −2
Original line number Diff line number Diff line
@@ -4352,7 +4352,7 @@ static int __init floppy_init(void) 
out_unreg_platform_dev:

	platform_device_unregister(&floppy_device[drive]);

out_flush_work:

	flush_scheduled_work();

	flush_work_sync(&floppy_work);

	if (atomic_read(&usage_count))

		floppy_release_irq_and_dma();

out_unreg_region:
@@ -4422,7 +4422,7 @@ static int floppy_grab_irq_and_dma(void) 
	 * We might have scheduled a free_irq(), wait it to

	 * drain first:

	 */

	flush_scheduled_work();

	flush_work_sync(&floppy_work);



	if (fd_request_irq()) {

		DPRINT("Unable to grab IRQ%d for the floppy driver\n",