From: Luis Chamberlain <mcgrof@kernel.org>
Date: Mon, 27 Sep 2021 22:02:51 +0000 (-0700)
Subject: floppy: use blk_cleanup_disk()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3776339ae7acaf9590c668e86f45005fc9aff014;p=linux.git

floppy: use blk_cleanup_disk()

Use the blk_cleanup_queue() followed by put_disk() can be
replaced with blk_cleanup_disk(). No need for two separate
loops.

Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
Link: https://lore.kernel.org/r/20210927220302.1073499-4-mcgrof@kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 2ee4d3e7ea2d7..74996728fc241 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -4951,13 +4951,9 @@ static void __exit floppy_module_exit(void)
 		}
 		for (i = 0; i < ARRAY_SIZE(floppy_type); i++) {
 			if (disks[drive][i])
-				blk_cleanup_queue(disks[drive][i]->queue);
+				blk_cleanup_disk(disks[drive][i]);
 		}
 		blk_mq_free_tag_set(&tag_sets[drive]);
-		for (i = 0; i < ARRAY_SIZE(floppy_type); i++) {
-			if (disks[drive][i])
-				put_disk(disks[drive][i]);
-		}
 	}
 
 	cancel_delayed_work_sync(&fd_timeout);