2023-12-19 08:28:56

by Chanwoo Lee

Subject: [PATCH] scsi: ufs: qcom: Remove unnecessary goto statement from ufs_qcom_config_esi function

From: ChanWoo Lee <[email protected]>

There is only one place where goto is used,
and it is unnecessary to check the ret value through 'goto out'
because the ret value is already true.

Therefore, remove the goto statement and
integrate the '!ret' condition into the existing code.

Signed-off-by: ChanWoo Lee <[email protected]>
---
drivers/ufs/host/ufs-qcom.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c
index 17e24270477d..8cf803806326 100644
--- a/drivers/ufs/host/ufs-qcom.c
+++ b/drivers/ufs/host/ufs-qcom.c
@@ -1929,7 +1929,7 @@ static int ufs_qcom_config_esi(struct ufs_hba *hba)
ufs_qcom_write_msi_msg);
if (ret) {
dev_err(hba->dev, "Failed to request Platform MSI %d\n", ret);
- goto out;
+ return ret;
}

msi_lock_descs(hba->dev);
@@ -1964,11 +1964,8 @@ static int ufs_qcom_config_esi(struct ufs_hba *hba)
REG_UFS_CFG3);
}
ufshcd_mcq_enable_esi(hba);
- }
-
-out:
- if (!ret)
host->esi_enabled = true;
+ }

return ret;
}
--
2.29.0

2023-12-19 18:06:34

by Christophe JAILLET

Subject: Re: [PATCH] scsi: ufs: qcom: Remove unnecessary goto statement from ufs_qcom_config_esi function

Le 19/12/2023 à 09:27, Chanwoo Lee a écrit :
> From: ChanWoo Lee <[email protected]>
>
> There is only one place where goto is used,
> and it is unnecessary to check the ret value through 'goto out'
> because the ret value is already true.
>
> Therefore, remove the goto statement and
> integrate the '!ret' condition into the existing code.
>
> Signed-off-by: ChanWoo Lee <[email protected]>

Reviewed-by: Christophe JAILLET <[email protected]>

> ---
> drivers/ufs/host/ufs-qcom.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c
> index 17e24270477d..8cf803806326 100644
> --- a/drivers/ufs/host/ufs-qcom.c
> +++ b/drivers/ufs/host/ufs-qcom.c
> @@ -1929,7 +1929,7 @@ static int ufs_qcom_config_esi(struct ufs_hba *hba)
> ufs_qcom_write_msi_msg);
> if (ret) {
> dev_err(hba->dev, "Failed to request Platform MSI %d\n", ret);
> - goto out;
> + return ret;
> }
>
> msi_lock_descs(hba->dev);
> @@ -1964,11 +1964,8 @@ static int ufs_qcom_config_esi(struct ufs_hba *hba)
> REG_UFS_CFG3);
> }
> ufshcd_mcq_enable_esi(hba);
> - }
> -
> -out:
> - if (!ret)
> host->esi_enabled = true;
> + }
>
> return ret;
> }

2023-12-20 11:34:17

by Manivannan Sadhasivam

Subject: Re: [PATCH] scsi: ufs: qcom: Remove unnecessary goto statement from ufs_qcom_config_esi function

On Tue, Dec 19, 2023 at 05:27:40PM +0900, Chanwoo Lee wrote:
> From: ChanWoo Lee <[email protected]>
>
> There is only one place where goto is used,
> and it is unnecessary to check the ret value through 'goto out'
> because the ret value is already true.
>
> Therefore, remove the goto statement and
> integrate the '!ret' condition into the existing code.
>
> Signed-off-by: ChanWoo Lee <[email protected]>

Reviewed-by: Manivannan Sadhasivam <[email protected]>

- Mani

> ---
> drivers/ufs/host/ufs-qcom.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c
> index 17e24270477d..8cf803806326 100644
> --- a/drivers/ufs/host/ufs-qcom.c
> +++ b/drivers/ufs/host/ufs-qcom.c
> @@ -1929,7 +1929,7 @@ static int ufs_qcom_config_esi(struct ufs_hba *hba)
> ufs_qcom_write_msi_msg);
> if (ret) {
> dev_err(hba->dev, "Failed to request Platform MSI %d\n", ret);
> - goto out;
> + return ret;
> }
>
> msi_lock_descs(hba->dev);
> @@ -1964,11 +1964,8 @@ static int ufs_qcom_config_esi(struct ufs_hba *hba)
> REG_UFS_CFG3);
> }
> ufshcd_mcq_enable_esi(hba);
> - }
> -
> -out:
> - if (!ret)
> host->esi_enabled = true;
> + }
>
> return ret;
> }
> --
> 2.29.0
>

--
மணிவண்ணன் சதாசிவம்

2024-01-04 04:06:13

by Martin K. Petersen

Subject: Re: [PATCH] scsi: ufs: qcom: Remove unnecessary goto statement from ufs_qcom_config_esi function

Chanwoo,

> There is only one place where goto is used, and it is unnecessary to
> check the ret value through 'goto out' because the ret value is
> already true.

Applied to 6.8/scsi-staging, thanks!

--
Martin K. Petersen Oracle Linux Engineering