From: Enze Li <lienze@kylinos.cn>
To: jejb@linux.ibm.com, martin.petersen@oracle.com
Cc: lienze@kylinos.cn, linux-scsi@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] scsi: sr: simplify the sr_open function
Date: Fri, 16 Sep 2022 17:04:25 +0800 [thread overview]
Message-ID: <20220916090425.604738-1-lienze@kylinos.cn> (raw)
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 a278b739d0c5..ad1704e21609 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -587,20 +587,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)
--
2.37.3
next reply other threads:[~2022-09-16 9:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-16 9:04 Enze Li [this message]
2023-03-27 3:02 [PATCH] scsi: sr: simplify the sr_open function Enze Li
2023-03-29 20:50 ` Bart Van Assche
2023-03-30 14:46 ` Benjamin Block
2023-04-03 1:37 ` Martin K. Petersen
2023-04-12 2:04 ` Martin K. Petersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220916090425.604738-1-lienze@kylinos.cn \
--to=lienze@kylinos.cn \
--cc=jejb@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.