[PATCH] ath11k: clean up in qmi_txn_wait error code handling

[PATCH] ath11k: clean up in qmi_txn_wait error code handling

[Govindaraj Saminathan]

qmi_txn_wait functions resp.resp.result is assigned to ret
variable and then returned from the function. The functions should
not return error codes from firmware, instead it should return -EINVAL.

Signed-off-by: Govindaraj Saminathan <gsamin@codeaurora.org>
---
 drivers/net/wireless/ath/ath11k/qmi.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/net/wireless/ath/ath11k/qmi.c b/drivers/net/wireless/ath/ath11k/qmi.c
index cb9ed9c..eb86fae 100644
--- a/drivers/net/wireless/ath/ath11k/qmi.c
+++ b/drivers/net/wireless/ath/ath11k/qmi.c
@@ -1546,7 +1546,7 @@ static int ath11k_qmi_host_cap_send(struct ath11k_base *ab)
 	if (resp.resp.result != QMI_RESULT_SUCCESS_V01) {
 		ath11k_warn(ab, "Host capability request failed, result: %d, err: %d\n",
 			    resp.resp.result, resp.resp.error);
-		ret = resp.resp.result;
+		ret = -EINVAL;
 		goto out;
 	}
 
@@ -1610,7 +1610,7 @@ static int ath11k_qmi_fw_ind_register_send(struct ath11k_base *ab)
 	if (resp->resp.result != QMI_RESULT_SUCCESS_V01) {
 		ath11k_warn(ab, "FW Ind register request failed, result: %d, err: %d\n",
 			    resp->resp.result, resp->resp.error);
-		ret = resp->resp.result;
+		ret = -EINVAL;
 		goto out;
 	}
 
@@ -1666,7 +1666,7 @@ static int ath11k_qmi_respond_fw_mem_request(struct ath11k_base *ab)
 	if (resp.resp.result != QMI_RESULT_SUCCESS_V01) {
 		ath11k_warn(ab, "Respond mem req failed, result: %d, err: %d\n",
 			    resp.resp.result, resp.resp.error);
-		ret = resp.resp.result;
+		ret = -EINVAL;
 		goto out;
 	}
 out:
@@ -1753,7 +1753,7 @@ static int ath11k_qmi_request_target_cap(struct ath11k_base *ab)
 	if (resp.resp.result != QMI_RESULT_SUCCESS_V01) {
 		ath11k_warn(ab, "qmi targetcap req failed, result: %d, err: %d\n",
 			    resp.resp.result, resp.resp.error);
-		ret = resp.resp.result;
+		ret = -EINVAL;
 		goto out;
 	}
 
@@ -1921,7 +1921,7 @@ static int ath11k_qmi_load_bdf(struct ath11k_base *ab)
 		if (resp.resp.result != QMI_RESULT_SUCCESS_V01) {
 			ath11k_warn(ab, "qmi BDF download failed, result: %d, err: %d\n",
 				    resp.resp.result, resp.resp.error);
-			ret = resp.resp.result;
+			ret = -EINVAL;
 			goto out_qmi_bdf;
 		}
 	}
@@ -1970,7 +1970,7 @@ static int ath11k_qmi_wlanfw_m3_info_send(struct ath11k_base *ab)
 	if (resp.resp.result != QMI_RESULT_SUCCESS_V01) {
 		ath11k_warn(ab, "qmi M3 info request failed, result: %d, err: %d\n",
 			    resp.resp.result, resp.resp.error);
-		ret = resp.resp.result;
+		ret = -EINVAL;
 		goto out;
 	}
 out:
@@ -2021,7 +2021,7 @@ static int ath11k_qmi_wlanfw_mode_send(struct ath11k_base *ab,
 	if (resp.resp.result != QMI_RESULT_SUCCESS_V01) {
 		ath11k_warn(ab, "Mode request failed, mode: %d, result: %d err: %d\n",
 			    mode, resp.resp.result, resp.resp.error);
-		ret = resp.resp.result;
+		ret = -EINVAL;
 		goto out;
 	}
 
@@ -2099,7 +2099,7 @@ static int ath11k_qmi_wlanfw_wlan_cfg_send(struct ath11k_base *ab)
 	if (resp.resp.result != QMI_RESULT_SUCCESS_V01) {
 		ath11k_warn(ab, "qmi wlan config request failed, result: %d, err: %d\n",
 			    resp.resp.result, resp.resp.error);
-		ret = resp.resp.result;
+		ret = -EINVAL;
 		goto out;
 	}
 
-- 
1.9.1


_______________________________________________
ath11k mailing list
ath11k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath11k

Re: [PATCH] ath11k: clean up in qmi_txn_wait error code handling

[Kalle Valo]

Govindaraj Saminathan <gsamin@codeaurora.org> wrote:

> qmi_txn_wait functions resp.resp.result is assigned to ret
> variable and then returned from the function. The functions should
> not return error codes from firmware, instead it should return -EINVAL.
> 
> Signed-off-by: Govindaraj Saminathan <gsamin@codeaurora.org>
> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

Patch applied to ath11k-bringup branch of ath.git, thanks.

d5fff50f82df ath11k: clean up in qmi_txn_wait error code handling

-- 
https://patchwork.kernel.org/patch/11009821/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches


_______________________________________________
ath11k mailing list
ath11k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath11k