From: Kalle Valo <kvalo@kernel.org>
To: ath11k@lists.infradead.org
Cc: linux-wireless@vger.kernel.org
Subject: [PATCH 06/15] wifi: ath11k: wmi: cleanup error handling in ath11k_wmi_send_init_country_cmd()
Date: Fri, 9 Jun 2023 17:24:31 +0300 [thread overview]
Message-ID: <20230609142440.24643-7-kvalo@kernel.org> (raw)
In-Reply-To: <20230609142440.24643-1-kvalo@kernel.org>
From: Kalle Valo <quic_kvalo@quicinc.com>
The error handling doesn't follow the preferred style so fix that.
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
---
drivers/net/wireless/ath/ath11k/wmi.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c
index 6ce36879a503..3b26e227e80c 100644
--- a/drivers/net/wireless/ath/ath11k/wmi.c
+++ b/drivers/net/wireless/ath/ath11k/wmi.c
@@ -2866,21 +2866,25 @@ ath11k_wmi_send_init_country_cmd(struct ath11k *ar,
cmd->cc_info.regdom_id = init_cc_params.cc_info.regdom_id;
break;
default:
+ ath11k_warn(ar->ab, "unknown cc params flags: 0x%x",
+ init_cc_params.flags);
ret = -EINVAL;
- goto out;
+ goto err;
}
ret = ath11k_wmi_cmd_send(wmi, skb,
WMI_SET_INIT_COUNTRY_CMDID);
-
-out:
if (ret) {
ath11k_warn(ar->ab,
"failed to send WMI_SET_INIT_COUNTRY CMD :%d\n",
ret);
- dev_kfree_skb(skb);
+ goto err;
}
+ return 0;
+
+err:
+ dev_kfree_skb(skb);
return ret;
}
--
2.30.2
next prev parent reply other threads:[~2023-06-09 14:25 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-09 14:24 [PATCH 00/15] wifi: ath11k: debug message improvements Kalle Valo
2023-06-09 14:24 ` [PATCH 01/15] wifi: ath11k: debug: remove unused ATH11K_DBG_ANY Kalle Valo
2023-06-13 9:11 ` Kalle Valo
2023-06-09 14:24 ` [PATCH 02/15] wifi: ath11k: print debug level in debug messages Kalle Valo
2023-06-09 14:24 ` [PATCH 03/15] wifi: ath11k: remove manual mask names from " Kalle Valo
2023-06-09 14:24 ` [PATCH 04/15] wifi: ath11k: add WMI event " Kalle Valo
2023-06-09 14:24 ` [PATCH 05/15] wifi: ath11k: remove unsupported event handlers Kalle Valo
2023-06-09 14:24 ` Kalle Valo [this message]
2023-06-09 14:24 ` [PATCH 07/15] wifi: ath11k: wmi: use common error handling style Kalle Valo
2023-06-09 14:24 ` [PATCH 08/15] wifi: ath11k: wmi: add unified command debug messages Kalle Valo
2023-06-09 14:24 ` [PATCH 09/15] wifi: ath11k: pci: cleanup debug logging Kalle Valo
2023-06-09 14:24 ` [PATCH 10/15] wifi: ath11k: dp: cleanup debug message Kalle Valo
2023-06-09 14:24 ` [PATCH 11/15] wifi: ath11k: debug: use all upper case in ATH11k_DBG_HAL Kalle Valo
2023-06-09 14:24 ` [PATCH 12/15] wifi: ath11k: hal: cleanup debug message Kalle Valo
2023-06-09 14:24 ` [PATCH 13/15] wifi: ath11k: don't use %pK Kalle Valo
2023-06-09 14:24 ` [PATCH 14/15] wifi: ath11k: htc: cleanup debug messages Kalle Valo
2023-06-09 14:24 ` [PATCH 15/15] wifi: ath11k: debug: add ATH11K_DBG_CE Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230609142440.24643-7-kvalo@kernel.org \
--to=kvalo@kernel.org \
--cc=ath11k@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).