diff options
| author | Lukas Bulwahn <lukas.bulwahn@gmail.com> | 2022-03-14 16:03:21 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-03-15 14:41:59 -0600 |
| commit | 79d45f57a19537a1ec6ebf836944e968b154f86e (patch) | |
| tree | 5975291465ee722621c16abbd36cc9c7e767c4e6 /drivers/scsi | |
| parent | 6b2b04590b51aa4cf395fcd185ce439cab5961dc (diff) | |
| download | linux-79d45f57a19537a1ec6ebf836944e968b154f86e.tar.bz2 | |
sr: simplify the local variable initialization in sr_block_open()
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>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/sr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index 11fbdc75bb71..641552d6330b 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c @@ -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; |