summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorEnze Li <lienze@kylinos.cn>2023-03-27 11:02:37 +0800
committerMartin K. Petersen <martin.petersen@oracle.com>2023-04-02 21:36:47 -0400
commitca62009eff728c0a62ea76184adcc6be411f4066 (patch)
tree6939412993a739d5c0aeb219f1103d3c121ebb41 /drivers
parentaa4d7812cf2cb0847e027d0e2a124926eea9d4fb (diff)
scsi: sr: Simplify the sr_open() function
Simplify the sr_open() by removing the goto label as the function only returns one error code. Signed-off-by: Enze Li <lienze@kylinos.cn> Link: https://lore.kernel.org/r/20230327030237.3407253-1-lienze@kylinos.cn Reviewed-by: Bart Van Assche <bvanassche@acm.org> Reviewed-by: Benjamin Block <bblock@linux.ibm.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/sr.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 9e51dcd30bfd..12869e6d4ebd 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -590,20 +590,15 @@ static int sr_open(struct cdrom_device_info *cdi, int purpose)
{
struct scsi_cd *cd = cdi->handle;
struct scsi_device *sdev = cd->device;
- int retval;
/*
* If the device is in error recovery, wait until it is done.
* If the device is offline, then disallow any access to it.
*/
- retval = -ENXIO;
if (!scsi_block_when_processing_errors(sdev))
- goto error_out;
+ return -ENXIO;
return 0;
-
-error_out:
- return retval;
}
static void sr_release(struct cdrom_device_info *cdi)