block/ataflop: use the blk_cleanup_disk() helper
authorLuis Chamberlain <mcgrof@kernel.org>
Mon, 27 Sep 2021 22:02:59 +0000 (15:02 -0700)
committerJens Axboe <axboe@kernel.dk>
Mon, 18 Oct 2021 20:41:37 +0000 (14:41 -0600)
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>
drivers/block/ataflop.c

index 58e921ab57298432a2974eb523876faddc59cad3..bc8cf7a991af1bde1042462f616e1f0b1252bdf2 100644 (file)
@@ -2077,8 +2077,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);
        }
 
@@ -2136,8 +2135,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);
        }