block/ataflop: use the blk_cleanup_disk() helper

[ Upstream commit 44a469b6acae6ad05c4acca8429467d1d50a8b8d ]

Use the helper to replace two lines with one.

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

diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c
index 4947e41f89b7d1f286aea9c3159b7e7438332914..1a908455ff96feb39c59655efe65982e4721eaa7 100644 (file)
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@ -2097,8 +2097,7 @@ static int __init atari_floppy_init (void)
 
 err:
        while (--i >= 0) {
-               blk_cleanup_queue(unit[i].disk[0]->queue);
-               put_disk(unit[i].disk[0]);
+               blk_cleanup_disk(unit[i].disk[0]);
                blk_mq_free_tag_set(&unit[i].tag_set);
        }
 
@@ -2156,8 +2155,7 @@ static void __exit atari_floppy_exit(void)
                        if (!unit[i].disk[type])
                                continue;
                        del_gendisk(unit[i].disk[type]);
-                       blk_cleanup_queue(unit[i].disk[type]->queue);
-                       put_disk(unit[i].disk[type]);
+                       blk_cleanup_disk(unit[i].disk[type]);
                }
                blk_mq_free_tag_set(&unit[i].tag_set);
        }