diff mbox series

scsi: ufs: qcom: Re-fix for error handling

Message ID 20231213022500.9011-1-cw9316.lee@samsung.com
State New
Headers show
Series scsi: ufs: qcom: Re-fix for error handling | expand

Commit Message

Chanwoo Lee Dec. 13, 2023, 2:25 a.m. UTC 
From: ChanWoo Lee <cw9316.lee@samsung.com>

I modified the code to handle errors.

The error handling code has been changed from the patch below.
-'commit 031312dbc695 ("scsi: ufs: ufs-qcom: Remove unnecessary goto statements")'

What I have confirmed are three cases.
1) ufs_qcom_host_reset -> 'reset_control_deassert' error -> return 0;
2) ufs_qcom_clk_scale_notify -> 'ufs_qcom_clk_scale_up_/down_pre_change' error -> return 0;
3) ufs_qcom_init_lane_clks -> 'ufs_qcom_host_clk_get(tx_lane1_sync_clk)' error -> return 0;

It is unknown whether the above commit was intended to change error handling.
However, if it is not an intended fix, a patch may be needed.

Signed-off-by: ChanWoo Lee <cw9316.lee@samsung.com>
---
 drivers/ufs/host/ufs-qcom.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c
index 96cb8b5b4e66..8a93d93ab08f 100644
--- a/drivers/ufs/host/ufs-qcom.c
+++ b/drivers/ufs/host/ufs-qcom.c
@@ -313,6 +313,8 @@  static int ufs_qcom_init_lane_clks(struct ufs_qcom_host *host)
 
 		err = ufs_qcom_host_clk_get(dev, "tx_lane1_sync_clk",
 			&host->tx_l1_sync_clk, true);
+		if (err)
+			return err;
 	}
 
 	return 0;
@@ -404,9 +406,11 @@  static int ufs_qcom_host_reset(struct ufs_hba *hba)
 	usleep_range(200, 210);
 
 	ret = reset_control_deassert(host->core_reset);
-	if (ret)
+	if (ret) {
 		dev_err(hba->dev, "%s: core_reset deassert failed, err = %d\n",
 				 __func__, ret);
+		return ret;
+	}
 
 	usleep_range(1000, 1100);
 
@@ -415,7 +419,7 @@  static int ufs_qcom_host_reset(struct ufs_hba *hba)
 		hba->is_irq_enabled = true;
 	}
 
-	return 0;
+	return ret;
 }
 
 static u32 ufs_qcom_get_hs_gear(struct ufs_hba *hba)
@@ -1535,7 +1539,7 @@  static int ufs_qcom_clk_scale_notify(struct ufs_hba *hba,
 		ufshcd_uic_hibern8_exit(hba);
 	}
 
-	return 0;
+	return err;
 }
 
 static void ufs_qcom_enable_test_bus(struct ufs_qcom_host *host)