From: Bart Van Assche <bvanassche@acm.org>
To: "Martin K . Petersen" <martin.petersen@oracle.com>
Cc: linux-scsi@vger.kernel.org, Bart Van Assche <bvanassche@acm.org>,
"James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>,
Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>,
Peter Wang <peter.wang@mediatek.com>,
Avri Altman <avri.altman@wdc.com>,
Andrew Halaney <ahalaney@redhat.com>,
Bean Huo <beanhuo@micron.com>
Subject: [PATCH v4 09/10] scsi: ufs: core: Move code out of an if-statement
Date: Thu, 5 Sep 2024 15:01:35 -0700 [thread overview]
Message-ID: <20240905220214.738506-10-bvanassche@acm.org> (raw)
In-Reply-To: <20240905220214.738506-1-bvanassche@acm.org>
The previous patch in this series introduced identical code in both
branches of an if-statement. Move that code outside the if-statement.
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
drivers/ufs/core/ufshcd.c | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index b46e9b526839..17615b56e83e 100644
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -10391,21 +10391,15 @@ static int ufshcd_add_scsi_host(struct ufs_hba *hba)
dev_err(hba->dev, "MCQ mode is disabled, err=%d\n",
err);
}
- err = scsi_add_host(hba->host, hba->dev);
- if (err) {
- dev_err(hba->dev, "scsi_add_host failed\n");
- return err;
- }
- hba->scsi_host_added = true;
- } else {
- err = scsi_add_host(hba->host, hba->dev);
- if (err) {
- dev_err(hba->dev, "scsi_add_host failed\n");
- return err;
- }
- hba->scsi_host_added = true;
}
+ err = scsi_add_host(hba->host, hba->dev);
+ if (err) {
+ dev_err(hba->dev, "scsi_add_host failed\n");
+ return err;
+ }
+ hba->scsi_host_added = true;
+
hba->tmf_tag_set = (struct blk_mq_tag_set) {
.nr_hw_queues = 1,
.queue_depth = hba->nutmrs,
next prev parent reply other threads:[~2024-09-05 22:03 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-05 22:01 [PATCH v4 00/10] Simplify the UFS driver initialization code Bart Van Assche
2024-09-05 22:01 ` [PATCH v4 01/10] scsi: ufs: core: Introduce ufshcd_add_scsi_host() Bart Van Assche
2024-09-06 23:51 ` Bao D. Nguyen
2024-09-05 22:01 ` [PATCH v4 02/10] scsi: ufs: core: Introduce ufshcd_activate_link() Bart Van Assche
2024-09-06 23:59 ` Bao D. Nguyen
2024-09-09 17:08 ` Bart Van Assche
2024-09-05 22:01 ` [PATCH v4 03/10] scsi: ufs: core: Introduce ufshcd_post_device_init() Bart Van Assche
2024-09-07 0:24 ` Bao D. Nguyen
2024-09-05 22:01 ` [PATCH v4 04/10] scsi: ufs: core: Call ufshcd_add_scsi_host() later Bart Van Assche
2024-09-07 10:52 ` Bao D. Nguyen
2024-09-05 22:01 ` [PATCH v4 05/10] scsi: ufs: core: Move the ufshcd_device_init() call Bart Van Assche
2024-09-07 11:12 ` Bao D. Nguyen
2024-09-05 22:01 ` [PATCH v4 06/10] scsi: ufs: core: Move the ufshcd_device_init(hba, true) call Bart Van Assche
2024-09-07 19:38 ` Bao D. Nguyen
2024-09-05 22:01 ` [PATCH v4 07/10] scsi: ufs: core: Expand " Bart Van Assche
2024-09-07 20:15 ` Bao D. Nguyen
2024-09-05 22:01 ` [PATCH v4 08/10] scsi: ufs: core: Move the MCQ scsi_add_host() call Bart Van Assche
2024-09-07 20:27 ` Bao D. Nguyen
2024-09-05 22:01 ` Bart Van Assche [this message]
2024-09-07 20:36 ` [PATCH v4 09/10] scsi: ufs: core: Move code out of an if-statement Bao D. Nguyen
2024-09-05 22:01 ` [PATCH v4 10/10] scsi: ufs: core: Remove the second argument of ufshcd_device_init() Bart Van Assche
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=20240905220214.738506-10-bvanassche@acm.org \
--to=bvanassche@acm.org \
--cc=James.Bottomley@HansenPartnership.com \
--cc=ahalaney@redhat.com \
--cc=avri.altman@wdc.com \
--cc=beanhuo@micron.com \
--cc=linux-scsi@vger.kernel.org \
--cc=manivannan.sadhasivam@linaro.org \
--cc=martin.petersen@oracle.com \
--cc=peter.wang@mediatek.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox