* [PATCH v3 0/2] make UFS dev_cmd more readable
@ 2020-08-14 9:50 Bean Huo
2020-08-14 9:50 ` [PATCH v3 1/2] scsi: ufs: change ufshcd_comp_devman_upiu() to ufshcd_compose_devman_upiu() Bean Huo
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Bean Huo @ 2020-08-14 9:50 UTC (permalink / raw)
To: alim.akhtar, avri.altman, asutoshd, jejb, martin.petersen,
stanley.chu, beanhuo, bvanassche, tomas.winkler, cang
Cc: linux-scsi, linux-kernel
From: Bean Huo <beanhuo@micron.com>
Changelog:
v2 -v3:
1. fix a coding style issue in [2/2] (Asutosh Das)
v1 - v2:
1. remove original patch scsi: ufs: differentiate dev_cmd trace message
2. add new patch scsi: ufs: remove several redundant goto statements
Bean Huo (2):
scsi: ufs: change ufshcd_comp_devman_upiu() to
ufshcd_compose_devman_upiu()
scsi: ufs: remove several redundant goto statements
drivers/scsi/ufs/ufshcd.c | 32 +++++++++-----------------------
1 file changed, 9 insertions(+), 23 deletions(-)
--
2.17.1
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH v3 1/2] scsi: ufs: change ufshcd_comp_devman_upiu() to ufshcd_compose_devman_upiu() 2020-08-14 9:50 [PATCH v3 0/2] make UFS dev_cmd more readable Bean Huo @ 2020-08-14 9:50 ` Bean Huo 2020-08-14 16:37 ` Asutosh Das ` (2 more replies) 2020-08-14 9:50 ` [PATCH v3 2/2] scsi: ufs: remove several redundant goto statements Bean Huo 2020-08-18 3:11 ` [PATCH v3 0/2] make UFS dev_cmd more readable Martin K. Petersen 2 siblings, 3 replies; 9+ messages in thread From: Bean Huo @ 2020-08-14 9:50 UTC (permalink / raw) To: alim.akhtar, avri.altman, asutoshd, jejb, martin.petersen, stanley.chu, beanhuo, bvanassche, tomas.winkler, cang Cc: linux-scsi, linux-kernel From: Bean Huo <beanhuo@micron.com> ufshcd_comp_devman_upiu() alwasy make me confuse that it is a request completion calling function. Change it to ufshcd_compose_devman_upiu(). Signed-off-by: Bean Huo <beanhuo@micron.com> Acked-by: Avri Altman <avri.altman@wdc.com> --- drivers/scsi/ufs/ufshcd.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 5f09cda7b21c..e3663b85e8ee 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -2391,12 +2391,13 @@ static inline void ufshcd_prepare_utp_nop_upiu(struct ufshcd_lrb *lrbp) } /** - * ufshcd_comp_devman_upiu - UFS Protocol Information Unit(UPIU) + * ufshcd_compose_devman_upiu - UFS Protocol Information Unit(UPIU) * for Device Management Purposes * @hba: per adapter instance * @lrbp: pointer to local reference block */ -static int ufshcd_comp_devman_upiu(struct ufs_hba *hba, struct ufshcd_lrb *lrbp) +static int ufshcd_compose_devman_upiu(struct ufs_hba *hba, + struct ufshcd_lrb *lrbp) { u8 upiu_flags; int ret = 0; @@ -2590,7 +2591,7 @@ static int ufshcd_compose_dev_cmd(struct ufs_hba *hba, ufshcd_prepare_lrbp_crypto(NULL, lrbp); hba->dev_cmd.type = cmd_type; - return ufshcd_comp_devman_upiu(hba, lrbp); + return ufshcd_compose_devman_upiu(hba, lrbp); } static int -- 2.17.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v3 1/2] scsi: ufs: change ufshcd_comp_devman_upiu() to ufshcd_compose_devman_upiu() 2020-08-14 9:50 ` [PATCH v3 1/2] scsi: ufs: change ufshcd_comp_devman_upiu() to ufshcd_compose_devman_upiu() Bean Huo @ 2020-08-14 16:37 ` Asutosh Das [not found] ` <ca175083f887ab0204f63002b5e2c4c7@codeaurora.org> 2020-08-16 1:01 ` Stanley Chu 2 siblings, 0 replies; 9+ messages in thread From: Asutosh Das @ 2020-08-14 16:37 UTC (permalink / raw) To: Bean Huo Cc: alim.akhtar, avri.altman, jejb, martin.petersen, stanley.chu, beanhuo, bvanassche, tomas.winkler, cang, linux-scsi, linux-kernel On Fri, Aug 14 2020 at 02:50 -0700, Bean Huo wrote: >From: Bean Huo <beanhuo@micron.com> > >ufshcd_comp_devman_upiu() alwasy make me confuse that it is a request >completion calling function. Change it to ufshcd_compose_devman_upiu(). > >Signed-off-by: Bean Huo <beanhuo@micron.com> >Acked-by: Avri Altman <avri.altman@wdc.com> >--- Reviewed-by: Asutosh Das <asutoshd@codeaurora.org> > drivers/scsi/ufs/ufshcd.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > >diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c >index 5f09cda7b21c..e3663b85e8ee 100644 >--- a/drivers/scsi/ufs/ufshcd.c >+++ b/drivers/scsi/ufs/ufshcd.c >@@ -2391,12 +2391,13 @@ static inline void ufshcd_prepare_utp_nop_upiu(struct ufshcd_lrb *lrbp) > } > > /** >- * ufshcd_comp_devman_upiu - UFS Protocol Information Unit(UPIU) >+ * ufshcd_compose_devman_upiu - UFS Protocol Information Unit(UPIU) > * for Device Management Purposes > * @hba: per adapter instance > * @lrbp: pointer to local reference block > */ >-static int ufshcd_comp_devman_upiu(struct ufs_hba *hba, struct ufshcd_lrb *lrbp) >+static int ufshcd_compose_devman_upiu(struct ufs_hba *hba, >+ struct ufshcd_lrb *lrbp) > { > u8 upiu_flags; > int ret = 0; >@@ -2590,7 +2591,7 @@ static int ufshcd_compose_dev_cmd(struct ufs_hba *hba, > ufshcd_prepare_lrbp_crypto(NULL, lrbp); > hba->dev_cmd.type = cmd_type; > >- return ufshcd_comp_devman_upiu(hba, lrbp); >+ return ufshcd_compose_devman_upiu(hba, lrbp); > } > > static int >-- >2.17.1 > ^ permalink raw reply [flat|nested] 9+ messages in thread
[parent not found: <ca175083f887ab0204f63002b5e2c4c7@codeaurora.org>]
* Re: [PATCH v3 1/2] scsi: ufs: change ufshcd_comp_devman_upiu() to ufshcd_compose_devman_upiu() [not found] ` <ca175083f887ab0204f63002b5e2c4c7@codeaurora.org> @ 2020-08-15 10:37 ` Bean Huo 0 siblings, 0 replies; 9+ messages in thread From: Bean Huo @ 2020-08-15 10:37 UTC (permalink / raw) To: Can Guo Cc: alim.akhtar, avri.altman, asutoshd, jejb, martin.petersen, stanley.chu, beanhuo, bvanassche, tomas.winkler, linux-scsi, linux-kernel On Sat, 2020-08-15 at 09:52 +0800, Can Guo wrote: > Hi Bean, > > On 2020-08-14 17:50, Bean Huo wrote: > > From: Bean Huo <beanhuo@micron.com> > > > > ufshcd_comp_devman_upiu() alwasy make me confuse that it is a > > request > > completion calling function. Change it to > > ufshcd_compose_devman_upiu(). > > > > Signed-off-by: Bean Huo <beanhuo@micron.com> > > Acked-by: Avri Altman <avri.altman@wdc.com> > > I gave my reviewed by tag in previous version, you missed it. Here it > is > > Reviewed-by: Can Guo <cang@codeaurora.org> Can nice, thanks. Bean ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 1/2] scsi: ufs: change ufshcd_comp_devman_upiu() to ufshcd_compose_devman_upiu() 2020-08-14 9:50 ` [PATCH v3 1/2] scsi: ufs: change ufshcd_comp_devman_upiu() to ufshcd_compose_devman_upiu() Bean Huo 2020-08-14 16:37 ` Asutosh Das [not found] ` <ca175083f887ab0204f63002b5e2c4c7@codeaurora.org> @ 2020-08-16 1:01 ` Stanley Chu 2 siblings, 0 replies; 9+ messages in thread From: Stanley Chu @ 2020-08-16 1:01 UTC (permalink / raw) To: Bean Huo Cc: alim.akhtar, avri.altman, asutoshd, jejb, martin.petersen, beanhuo, bvanassche, tomas.winkler, cang, linux-scsi, linux-kernel On Fri, 2020-08-14 at 11:50 +0200, Bean Huo wrote: > From: Bean Huo <beanhuo@micron.com> > > ufshcd_comp_devman_upiu() alwasy make me confuse that it is a request > completion calling function. Change it to ufshcd_compose_devman_upiu(). > > Signed-off-by: Bean Huo <beanhuo@micron.com> > Acked-by: Avri Altman <avri.altman@wdc.com> > --- Reviewed-by: Stanley Chu <stanley.chu@mediatek.com> ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v3 2/2] scsi: ufs: remove several redundant goto statements 2020-08-14 9:50 [PATCH v3 0/2] make UFS dev_cmd more readable Bean Huo 2020-08-14 9:50 ` [PATCH v3 1/2] scsi: ufs: change ufshcd_comp_devman_upiu() to ufshcd_compose_devman_upiu() Bean Huo @ 2020-08-14 9:50 ` Bean Huo 2020-08-14 16:54 ` Asutosh Das 2020-08-16 1:01 ` Stanley Chu 2020-08-18 3:11 ` [PATCH v3 0/2] make UFS dev_cmd more readable Martin K. Petersen 2 siblings, 2 replies; 9+ messages in thread From: Bean Huo @ 2020-08-14 9:50 UTC (permalink / raw) To: alim.akhtar, avri.altman, asutoshd, jejb, martin.petersen, stanley.chu, beanhuo, bvanassche, tomas.winkler, cang Cc: linux-scsi, linux-kernel From: Bean Huo <beanhuo@micron.com> Signed-off-by: Bean Huo <beanhuo@micron.com> --- drivers/scsi/ufs/ufshcd.c | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index e3663b85e8ee..79b216c012d3 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -4256,10 +4256,8 @@ int ufshcd_make_hba_operational(struct ufs_hba *hba) dev_err(hba->dev, "Host controller not ready to process requests"); err = -EIO; - goto out; } -out: return err; } EXPORT_SYMBOL_GPL(ufshcd_make_hba_operational); @@ -5542,10 +5540,8 @@ static bool ufshcd_quirk_dl_nac_errors(struct ufs_hba *hba) hba->saved_err &= ~UIC_ERROR; /* clear NAC error */ hba->saved_uic_err &= ~UFSHCD_UIC_DL_NAC_RECEIVED_ERROR; - if (!hba->saved_uic_err) { + if (!hba->saved_uic_err) err_handling = false; - goto out; - } } out: spin_unlock_irqrestore(hba->host->host_lock, flags); @@ -7604,12 +7600,10 @@ static int ufshcd_config_vreg(struct device *dev, if (vreg->min_uV && vreg->max_uV) { min_uV = on ? vreg->min_uV : 0; ret = regulator_set_voltage(reg, min_uV, vreg->max_uV); - if (ret) { + if (ret) dev_err(dev, "%s: %s set voltage failed, err=%d\n", __func__, name, ret); - goto out; - } } } out: @@ -7672,8 +7666,6 @@ static int ufshcd_setup_vreg(struct ufs_hba *hba, bool on) goto out; ret = ufshcd_toggle_vreg(dev, info->vccq2, on); - if (ret) - goto out; out: if (ret) { @@ -7719,10 +7711,8 @@ static int ufshcd_init_vreg(struct ufs_hba *hba) goto out; ret = ufshcd_get_vreg(dev, info->vccq); - if (ret) - goto out; - - ret = ufshcd_get_vreg(dev, info->vccq2); + if (!ret) + ret = ufshcd_get_vreg(dev, info->vccq2); out: return ret; } @@ -7866,12 +7856,7 @@ static int ufshcd_variant_hba_init(struct ufs_hba *hba) err = ufshcd_vops_setup_regulators(hba, true); if (err) - goto out_exit; - - goto out; - -out_exit: - ufshcd_vops_exit(hba); + ufshcd_vops_exit(hba); out: if (err) dev_err(hba->dev, "%s: variant %s init failed err %d\n", -- 2.17.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v3 2/2] scsi: ufs: remove several redundant goto statements 2020-08-14 9:50 ` [PATCH v3 2/2] scsi: ufs: remove several redundant goto statements Bean Huo @ 2020-08-14 16:54 ` Asutosh Das 2020-08-16 1:01 ` Stanley Chu 1 sibling, 0 replies; 9+ messages in thread From: Asutosh Das @ 2020-08-14 16:54 UTC (permalink / raw) To: Bean Huo Cc: alim.akhtar, avri.altman, jejb, martin.petersen, stanley.chu, beanhuo, bvanassche, tomas.winkler, cang, linux-scsi, linux-kernel On Fri, Aug 14 2020 at 02:50 -0700, Bean Huo wrote: >From: Bean Huo <beanhuo@micron.com> > >Signed-off-by: Bean Huo <beanhuo@micron.com> Reviewed-by: Asutosh Das <asutoshd@codeaurora.org> >--- > drivers/scsi/ufs/ufshcd.c | 25 +++++-------------------- > 1 file changed, 5 insertions(+), 20 deletions(-) > >diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c >index e3663b85e8ee..79b216c012d3 100644 >--- a/drivers/scsi/ufs/ufshcd.c >+++ b/drivers/scsi/ufs/ufshcd.c >@@ -4256,10 +4256,8 @@ int ufshcd_make_hba_operational(struct ufs_hba *hba) > dev_err(hba->dev, > "Host controller not ready to process requests"); > err = -EIO; >- goto out; > } > >-out: > return err; > } > EXPORT_SYMBOL_GPL(ufshcd_make_hba_operational); >@@ -5542,10 +5540,8 @@ static bool ufshcd_quirk_dl_nac_errors(struct ufs_hba *hba) > hba->saved_err &= ~UIC_ERROR; > /* clear NAC error */ > hba->saved_uic_err &= ~UFSHCD_UIC_DL_NAC_RECEIVED_ERROR; >- if (!hba->saved_uic_err) { >+ if (!hba->saved_uic_err) > err_handling = false; >- goto out; >- } > } > out: > spin_unlock_irqrestore(hba->host->host_lock, flags); >@@ -7604,12 +7600,10 @@ static int ufshcd_config_vreg(struct device *dev, > if (vreg->min_uV && vreg->max_uV) { > min_uV = on ? vreg->min_uV : 0; > ret = regulator_set_voltage(reg, min_uV, vreg->max_uV); >- if (ret) { >+ if (ret) > dev_err(dev, > "%s: %s set voltage failed, err=%d\n", > __func__, name, ret); >- goto out; >- } > } > } > out: >@@ -7672,8 +7666,6 @@ static int ufshcd_setup_vreg(struct ufs_hba *hba, bool on) > goto out; > > ret = ufshcd_toggle_vreg(dev, info->vccq2, on); >- if (ret) >- goto out; > > out: > if (ret) { >@@ -7719,10 +7711,8 @@ static int ufshcd_init_vreg(struct ufs_hba *hba) > goto out; > > ret = ufshcd_get_vreg(dev, info->vccq); >- if (ret) >- goto out; >- >- ret = ufshcd_get_vreg(dev, info->vccq2); >+ if (!ret) >+ ret = ufshcd_get_vreg(dev, info->vccq2); > out: > return ret; > } >@@ -7866,12 +7856,7 @@ static int ufshcd_variant_hba_init(struct ufs_hba *hba) > > err = ufshcd_vops_setup_regulators(hba, true); > if (err) >- goto out_exit; >- >- goto out; >- >-out_exit: >- ufshcd_vops_exit(hba); >+ ufshcd_vops_exit(hba); > out: > if (err) > dev_err(hba->dev, "%s: variant %s init failed err %d\n", >-- >2.17.1 > ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 2/2] scsi: ufs: remove several redundant goto statements 2020-08-14 9:50 ` [PATCH v3 2/2] scsi: ufs: remove several redundant goto statements Bean Huo 2020-08-14 16:54 ` Asutosh Das @ 2020-08-16 1:01 ` Stanley Chu 1 sibling, 0 replies; 9+ messages in thread From: Stanley Chu @ 2020-08-16 1:01 UTC (permalink / raw) To: Bean Huo Cc: alim.akhtar, avri.altman, asutoshd, jejb, martin.petersen, beanhuo, bvanassche, tomas.winkler, cang, linux-scsi, linux-kernel On Fri, 2020-08-14 at 11:50 +0200, Bean Huo wrote: > From: Bean Huo <beanhuo@micron.com> > > Signed-off-by: Bean Huo <beanhuo@micron.com> Reviewed-by: Stanley Chu <stanley.chu@mediatek.com> ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 0/2] make UFS dev_cmd more readable 2020-08-14 9:50 [PATCH v3 0/2] make UFS dev_cmd more readable Bean Huo 2020-08-14 9:50 ` [PATCH v3 1/2] scsi: ufs: change ufshcd_comp_devman_upiu() to ufshcd_compose_devman_upiu() Bean Huo 2020-08-14 9:50 ` [PATCH v3 2/2] scsi: ufs: remove several redundant goto statements Bean Huo @ 2020-08-18 3:11 ` Martin K. Petersen 2 siblings, 0 replies; 9+ messages in thread From: Martin K. Petersen @ 2020-08-18 3:11 UTC (permalink / raw) To: cang, stanley.chu, beanhuo, avri.altman, alim.akhtar, bvanassche, jejb, asutoshd, Bean Huo, tomas.winkler Cc: Martin K . Petersen, linux-kernel, linux-scsi On Fri, 14 Aug 2020 11:50:32 +0200, Bean Huo wrote: > Changelog: > v2 -v3: > 1. fix a coding style issue in [2/2] (Asutosh Das) > > v1 - v2: > 1. remove original patch scsi: ufs: differentiate dev_cmd trace message > 2. add new patch scsi: ufs: remove several redundant goto statements > > [...] Applied to 5.10/scsi-queue, thanks! [1/2] scsi: ufs: Change ufshcd_comp_devman_upiu() to ufshcd_compose_devman_upiu() https://git.kernel.org/mkp/scsi/c/39e78be3474b [2/2] scsi: ufs: Remove several redundant goto statements https://git.kernel.org/mkp/scsi/c/e62212672ab5 -- Martin K. Petersen Oracle Linux Engineering ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2020-08-18 3:11 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-14 9:50 [PATCH v3 0/2] make UFS dev_cmd more readable Bean Huo
2020-08-14 9:50 ` [PATCH v3 1/2] scsi: ufs: change ufshcd_comp_devman_upiu() to ufshcd_compose_devman_upiu() Bean Huo
2020-08-14 16:37 ` Asutosh Das
[not found] ` <ca175083f887ab0204f63002b5e2c4c7@codeaurora.org>
2020-08-15 10:37 ` Bean Huo
2020-08-16 1:01 ` Stanley Chu
2020-08-14 9:50 ` [PATCH v3 2/2] scsi: ufs: remove several redundant goto statements Bean Huo
2020-08-14 16:54 ` Asutosh Das
2020-08-16 1:01 ` Stanley Chu
2020-08-18 3:11 ` [PATCH v3 0/2] make UFS dev_cmd more readable Martin K. Petersen
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).