Skip to contentSkip to conversation

make UFS dev_cmd more readable

PATCH Superseded Bean Huo 3 participants 7 messages Aug 12, 2020 – Aug 14, 2020 SCSI

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Bean Huo

author
#0 lore raw

v2 cover make UFS dev_cmd more readable

From: Bean Huo <[email protected]>

Changelog:
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 | 33 +++++++++------------------------
 1 file changed, 9 insertions(+), 24 deletions(-)
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH v2 1/2 scsi: ufs: change ufshcd_comp_devman_upiu() to ufshcd_compose_devman_upiu()

From: Bean Huo <[email protected]>

ufshcd_comp_devman_upiu() alwasy make me confuse that it is a request completion calling function. Change it to ufshcd_compose_devman_upiu().

---
 drivers/scsi/ufs/ufshcd.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/scsi/ufs/ufshcd.c +4 -3
index 5f09cda7b21c..e3663b85e8ee 100644
@@ -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
Signature · 1 line
2.17.1
Reviewed-by on v2 1/2
#2 lore raw

Re: [PATCH v2 1/2] scsi: ufs: change ufshcd_comp_devman_upiu() to ufshcd_compose_devman_upiu()

Quoted 7 lines · Bean Huo

From: Bean Huo <[email protected]>

ufshcd_comp_devman_upiu() alwasy make me confuse that it is a request completion calling function. Change it to ufshcd_compose_devman_upiu().

Quoted 36 lines

---
drivers/scsi/ufs/ufshcd.c | 7 ++++---

1 file changed, 4 insertions(+), 3 deletions(-)
drivers/scsi/ufs/ufshcd.c +4 -3
index 5f09cda7b21c..e3663b85e8ee 100644
@@ -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

Signature · 1 line
2.17.1
Reviewed-by
#3 lore raw

Re: [PATCH v2 1/2] scsi: ufs: change ufshcd_comp_devman_upiu() to ufshcd_compose_devman_upiu()

Quoted 10 lines · Asutosh Das
Quoted 7 lines · Bean Huo

From: Bean Huo <[email protected]>

ufshcd_comp_devman_upiu() alwasy make me confuse that it is a request completion calling function. Change it to ufshcd_compose_devman_upiu().

Quoted 39 lines
Quoted 39 lines

---
drivers/scsi/ufs/ufshcd.c | 7 ++++---

1 file changed, 4 insertions(+), 3 deletions(-)
drivers/scsi/ufs/ufshcd.c +3 -2
index 5f09cda7b21c..e3663b85e8ee 100644
@@ -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;
drivers/scsi/ufs/ufshcd.c +1 -1
@@ -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

author
#4 lore raw

PATCH v2 2/2 scsi: ufs: remove several redundant goto statements

In reply to Bean Huo

From: Bean Huo <[email protected]>

---
 drivers/scsi/ufs/ufshcd.c | 26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)
drivers/scsi/ufs/ufshcd.c +5 -21
index e3663b85e8ee..cd742c4f78b6 100644
@@ -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",
@@ -8036,7 +8021,6 @@ static int ufshcd_set_dev_pwr_mode(struct ufs_hba *hba,
 	}
 
 	cmd[4] = pwr_mode << 4;
-
 	/*
 	 * Current function would be generally called from the power management
 	 * callbacks hence set the RQF_PM flag so that it doesn't resume the
Signature · 1 line
2.17.1
#5 lore raw

Re: [PATCH v2 2/2] scsi: ufs: remove several redundant goto statements

Quoted 85 lines · Bean Huo

From: Bean Huo <[email protected]>

---
drivers/scsi/ufs/ufshcd.c | 26 +++++---------------------

1 file changed, 5 insertions(+), 21 deletions(-)
drivers/scsi/ufs/ufshcd.c +1 -5
index e3663b85e8ee..cd742c4f78b6 100644
@@ -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);
drivers/scsi/ufs/ufshcd.c +1 -3
@@ -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:

drivers/scsi/ufs/ufshcd.c +0 -2
@@ -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) {
drivers/scsi/ufs/ufshcd.c +2 -4
@@ -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;
}
drivers/scsi/ufs/ufshcd.c +1 -6
@@ -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",

drivers/scsi/ufs/ufshcd.c static int ufshcd_set_dev_pwr_mode(struct ufs_hba *hba, · line 8039

Quoted 4 lines
drivers/scsi/ufs/ufshcd.c +0 -1
@@ -8036,7 +8021,6 @@ static int ufshcd_set_dev_pwr_mode(struct ufs_hba *hba,
 	}
 
 	cmd[4] = pwr_mode << 4;
-

Change LGTM;
Nit-pick, line removed here by mistake, perhaps?

Quoted 6 lines
drivers/scsi/ufs/ufshcd.c +0 -0
 	/*
 	 * Current function would be generally called from the power management
 	 * callbacks hence set the RQF_PM flag so that it doesn't resume the
Signature · 1 line
2.17.1
author
#6 lore raw

Re: [PATCH v2 2/2] scsi: ufs: remove several redundant goto statements

Quoted 9 lines · Asutosh Das

drivers/scsi/ufs/ufshcd.c static int ufshcd_set_dev_pwr_mode(struct · line 8040

Quoted 6 lines
drivers/scsi/ufs/ufshcd.c +0 -1
@@ -8036,7 +8021,6 @@ static int ufshcd_set_dev_pwr_mode(struct
 ufs_hba *hba,
       }
 
       cmd[4] = pwr_mode << 4;
-

Change LGTM;
Nit-pick, line removed here by mistake, perhaps?

Hi Asutosh
thanks for your review. I add that empty line back, you can check.

thanks,
Bean