sr: simplify the local variable initialization in sr_block_open()
authorLukas Bulwahn <lukas.bulwahn@gmail.com>
Mon, 14 Mar 2022 15:03:21 +0000 (16:03 +0100)
committerJens Axboe <axboe@kernel.dk>
Tue, 15 Mar 2022 20:41:59 +0000 (14:41 -0600)
Commit 01d0c698536f ("sr: implement ->free_disk to simplify refcounting")
refactored sr_block_open(), initialized one variable with a duplicate
assignment (probably an unintended copy & paste duplication) and turned one
error case into an early return, which makes the initialization of the
return variable needless.

So, simplify the local variable initialization in sr_block_open() to make
the code a bit more clear.

No functional change. No change in resulting object code.

Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20220314150321.17720-1-lukas.bulwahn@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/scsi/sr.c

index 11fbdc7..641552d 100644 (file)
@@ -483,9 +483,9 @@ static void sr_revalidate_disk(struct scsi_cd *cd)
 
 static int sr_block_open(struct block_device *bdev, fmode_t mode)
 {
-       struct scsi_cd *cd = cd = scsi_cd(bdev->bd_disk);
+       struct scsi_cd *cd = scsi_cd(bdev->bd_disk);
        struct scsi_device *sdev = cd->device;
-       int ret = -ENXIO;
+       int ret;
 
        if (scsi_device_get(cd->device))
                return -ENXIO;