2022-10-28 08:00:44

by Keoseong Park

Subject: [PATCH] scsi: ufs: core: Refactor ufshcd_hba_enable()

Use "if error return" style in ufshcd_hba_enable().
No functional change.

Cc: Bart Van Assche <[email protected]>
Cc: Alim Akhtar <[email protected]>
Signed-off-by: Keoseong Park <[email protected]>
---
drivers/ufs/core/ufshcd.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index b2203dd79e8c..4288241040db 100644
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -4665,14 +4665,18 @@ int ufshcd_hba_enable(struct ufs_hba *hba)
/* enable UIC related interrupts */
ufshcd_enable_intr(hba, UFSHCD_UIC_MASK);
ret = ufshcd_dme_reset(hba);
- if (!ret) {
- ret = ufshcd_dme_enable(hba);
- if (!ret)
- ufshcd_vops_hce_enable_notify(hba, POST_CHANGE);
- if (ret)
- dev_err(hba->dev,
- "Host controller enable failed with non-hce\n");
+ if (ret) {
+ dev_err(hba->dev, "DME_RESET failed\n");
+ return ret;
}
+
+ ret = ufshcd_dme_enable(hba);
+ if (ret) {
+ dev_err(hba->dev, "Enabling DME failed\n");
+ return ret;
+ }
+
+ ufshcd_vops_hce_enable_notify(hba, POST_CHANGE);
} else {
ret = ufshcd_hba_execute_hce(hba);
}
--
2.17.1

2022-10-28 22:45:33

by Bart Van Assche

Subject: Re: [PATCH] scsi: ufs: core: Refactor ufshcd_hba_enable()

On 10/28/22 00:35, Keoseong Park wrote:
> Use "if error return" style in ufshcd_hba_enable().
> No functional change.

Reviewed-by: Bart Van Assche <[email protected]>

2022-11-08 03:04:50

by Martin K. Petersen

Subject: Re: [PATCH] scsi: ufs: core: Refactor ufshcd_hba_enable()

Keoseong,

> Use "if error return" style in ufshcd_hba_enable(). No functional
> change.

Applied to 6.2/scsi-staging, thanks!

--
Martin K. Petersen Oracle Linux Engineering

2022-11-17 19:00:09

by Martin K. Petersen

Subject: Re: [PATCH] scsi: ufs: core: Refactor ufshcd_hba_enable()

On Fri, 28 Oct 2022 16:35:53 +0900, Keoseong Park wrote:

> Use "if error return" style in ufshcd_hba_enable().
> No functional change.
>
>

Applied to 6.2/scsi-queue, thanks!

[1/1] scsi: ufs: core: Refactor ufshcd_hba_enable()
https://git.kernel.org/mkp/scsi/c/bc77fb9ce40c

--
Martin K. Petersen Oracle Linux Engineering