lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 786/917] block/ataflop: use the blk_cleanup_disk() helper
    Date
    From: Luis Chamberlain <mcgrof@kernel.org>

    [ 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>
    ---
    drivers/block/ataflop.c | 6 ++----
    1 file changed, 2 insertions(+), 4 deletions(-)

    diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c
    index 4947e41f89b7d..1a908455ff96f 100644
    --- 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);
    }
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 01:40    [W:5.110 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site