wifi: ath12k: unify error handling in some ath12k_wmi_xxx() functions
PATCH 1/1 wifi: ath12k: unify error handling in some ath12k_wmi_xxx() functions
This is purely cosmetic changes that simplifies & standardizes error handling for functions that ends with a ath12k_wmi_cmd_send() followed by trivial error handling. Saves a few lines of code too.
Compile tested only.
--- drivers/net/wireless/ath/ath12k/wmi.c | 32 +++++++-------------------- 1 file changed, 8 insertions(+), 24 deletions(-)
drivers/net/wireless/ath/ath12k/wmi.c +8 -24
@@ -4199,12 +4199,9 @@ int ath12k_wmi_pdev_lro_cfg(struct ath12k *ar,if (ret) {ath12k_warn (ar->ab,"failed to send lro cfg req wmi cmd\n" ); - goto err; +dev_kfree_skb (skb); } -return 0 ; -err: -dev_kfree_skb (skb);return ret; }
@@ -4335,12 +4332,9 @@ int ath12k_wmi_vdev_spectral_conf(struct ath12k *ar,if (ret) {ath12k_warn (ar->ab,"failed to send spectral scan config wmi cmd\n" ); - goto err; +dev_kfree_skb (skb); } -return 0 ; -err: -dev_kfree_skb (skb);return ret; }
@@ -4372,12 +4366,9 @@ int ath12k_wmi_vdev_spectral_enable(struct ath12k *ar, u32 vdev_id,if (ret) {ath12k_warn (ar->ab,"failed to send spectral enable wmi cmd\n" ); - goto err; +dev_kfree_skb (skb); } -return 0 ; -err: -dev_kfree_skb (skb);return ret; }
@@ -4418,12 +4409,9 @@ int ath12k_wmi_pdev_dma_ring_cfg(struct ath12k *ar,if (ret) {ath12k_warn (ar->ab,"failed to send dma ring cfg req wmi cmd\n" ); - goto err; +dev_kfree_skb (skb); } -return 0 ; -err: -dev_kfree_skb (skb);return ret; }
@@ -10874,10 +10862,9 @@ int ath12k_wmi_mlo_setup(struct ath12k *ar, struct wmi_mlo_setup_arg *mlo_paramsath12k_warn (ar->ab,"failed to submit WMI_MLO_SETUP_CMDID command: %d\n" , ret);dev_kfree_skb (skb); -return ret; } -return 0 ; +return ret; }int ath12k_wmi_mlo_ready (struct ath12k *ar)
@@ -10902,10 +10889,9 @@ int ath12k_wmi_mlo_ready(struct ath12k *ar)ath12k_warn (ar->ab,"failed to submit WMI_MLO_READY_CMDID command: %d\n" , ret);dev_kfree_skb (skb); -return ret; } -return 0 ; +return ret; }int ath12k_wmi_mlo_teardown (struct ath12k *ar)
@@ -10931,10 +10917,9 @@ int ath12k_wmi_mlo_teardown(struct ath12k *ar)ath12k_warn (ar->ab,"failed to submit WMI MLO teardown command: %d\n" , ret);dev_kfree_skb (skb); -return ret; } -return 0 ; +return ret; }bool ath12k_wmi_supports_6ghz_cc_ext (struct ath12k *ar)
@@ -10997,10 +10982,9 @@ int ath12k_wmi_send_vdev_set_tpc_power(struct ath12k *ar,if (ret) {ath12k_warn (ar->ab,"failed to send WMI_VDEV_SET_TPC_POWER_CMDID\n" );dev_kfree_skb (skb); -return ret; } -return 0 ; +return ret; } static int
Signature · 1 line
2.53.0
Quoted 9 lines · Nicolas Escande
This is purely cosmetic changes that simplifies & standardizes error handling for functions that ends with a
ath12k_wmi_cmd_send()followed by trivial error handling. Saves a few lines of code too.Compile tested only.
Signed-off-by Nicolas Escande <[email protected]>--- drivers/net/wireless/ath/ath12k/wmi.c | 32 +++++++--------------------
Quoted 7 lines · Nicolas Escande
This is purely cosmetic changes that simplifies & standardizes error handling for functions that ends with a
ath12k_wmi_cmd_send()followed by trivial error handling. Saves a few lines of code too.Compile tested only.
Signed-off-by Nicolas Escande <[email protected]>
Jeff Johnson
AppliedQuoted 8 lines · Nicolas Escande
This is purely cosmetic changes that simplifies & standardizes error handling for functions that ends with a
ath12k_wmi_cmd_send()followed by trivial error handling. Saves a few lines of code too.Compile tested only.
[...]
Applied, thanks!
[1/1] wifi: ath12k: unify error handling in some ath12k_wmi_xxx() functions
commit: 31d4f8d427f2b9e423d7e177fb15f934cf0e37dd
Best regards,
Signature · 1 line
Jeff Johnson <[email protected]>