| Message ID | 20230327030237.3407253-1-lienze@kylinos.cn (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | scsi: sr: simplify the sr_open function | expand |
On 3/26/23 20:02, Enze Li wrote: > Simplify the sr_open function by removing the goto label as it does only > return one error code. > > Signed-off-by: Enze Li <lienze@kylinos.cn> > --- > drivers/scsi/sr.c | 7 +------ > 1 file changed, 1 insertion(+), 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; > } Reviewed-by: Bart Van Assche <bvanassche@acm.org>
On Mon, Mar 27, 2023 at 11:02:37AM +0800, Enze Li wrote: > Simplify the sr_open function by removing the goto label as it does only > return one error code. > > Signed-off-by: Enze Li <lienze@kylinos.cn> > --- > drivers/scsi/sr.c | 7 +------ > 1 file changed, 1 insertion(+), 6 deletions(-) > Looks good to me. Reviewed-by: Benjamin Block <bblock@linux.ibm.com>
Enze, > Simplify the sr_open function by removing the goto label as it does only > return one error code. Applied to 6.4/scsi-staging, thanks!
On Mon, 27 Mar 2023 11:02:37 +0800, Enze Li wrote: > Simplify the sr_open function by removing the goto label as it does only > return one error code. > > Applied to 6.4/scsi-queue, thanks! [1/1] scsi: sr: simplify the sr_open function https://git.kernel.org/mkp/scsi/c/ca62009eff72
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)
Simplify the sr_open function by removing the goto label as it does only return one error code. Signed-off-by: Enze Li <lienze@kylinos.cn> --- drivers/scsi/sr.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)