scsi: sr: Simplify the sr_open() function
authorEnze Li <lienze@kylinos.cn>
Mon, 27 Mar 2023 03:02:37 +0000 (11:02 +0800)
committerMartin K. Petersen <martin.petersen@oracle.com>
Mon, 3 Apr 2023 01:36:47 +0000 (21:36 -0400)
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>
drivers/scsi/sr.c

index 9e51dcd..12869e6 100644 (file)
@@ -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)