ath11k: rename ath11k_wmi_base instances from wmi_sc to wmi_ab
Subsystems (2)
PATCH 1/1 ath11k: rename ath11k_wmi_base instances from wmi_sc to wmi_ab
This makes the code consistent with the recent sc to ab rename.
Signed-off-by John Crispin <[email protected]>
--- drivers/net/wireless/ath/ath11k/core.c | 4 +- drivers/net/wireless/ath/ath11k/core.h | 2 +- drivers/net/wireless/ath/ath11k/htc.c | 2 +- drivers/net/wireless/ath/ath11k/mac.c | 4 +- drivers/net/wireless/ath/ath11k/testmode.c | 2 +- drivers/net/wireless/ath/ath11k/wmi.c | 146 ++++++++++----------- drivers/net/wireless/ath/ath11k/wmi.h | 2 +- 7 files changed, 81 insertions(+), 81 deletions(-)
drivers/net/wireless/ath/ath11k/core.c +2 -2
@@ -629,7 +629,7 @@ static void ath11k_core_restart(struct work_struct *work)idr_destroy (&ar->txmgmt_idr); } -wake_up (&ab->wmi_sc.tx_credits_wq); +wake_up (&ab->wmi_ab.tx_credits_wq);wake_up (&ab->peer_mapping_wq); ret =ath11k_core_reconfigure_on_crash (ab);
@@ -739,7 +739,7 @@ struct ath11k_base *ath11k_core_alloc(struct device *dev)INIT_LIST_HEAD (&ab->peers);init_waitqueue_head (&ab->peer_mapping_wq); -init_waitqueue_head (&ab->wmi_sc.tx_credits_wq); +init_waitqueue_head (&ab->wmi_ab.tx_credits_wq);INIT_WORK (&ab->restart_work, ath11k_core_restart);timer_setup (&ab->rx_replenish_retry, ath11k_ce_rx_replenish_retry,0 ); ab->dev = dev;
drivers/net/wireless/ath/ath11k/core.h +1 -1
@@ -577,7 +577,7 @@ struct ath11k_base {struct platform_device *pdev;struct device *dev;struct ath11k_qmi qmi; -struct ath11k_wmi_base wmi_sc; +struct ath11k_wmi_base wmi_ab;struct completion fw_ready;struct rproc *tgt_rproc;int num_radios;
drivers/net/wireless/ath/ath11k/htc.c +1 -1
@@ -736,7 +736,7 @@ int ath11k_htc_init(struct ath11k_base *ab) htc->ab = ab; -switch (ab->wmi_sc.preferred_hw_mode) { +switch (ab->wmi_ab.preferred_hw_mode) {case WMI_HOST_HW_MODE_SINGLE : htc->wmi_ep_count =1 ;break ;
drivers/net/wireless/ath/ath11k/mac.c +2 -2
@@ -5245,7 +5245,7 @@ ath11k_mac_update_bss_chan_survey(struct ath11k *ar,lockdep_assert_held (&ar->conf_mutex); -if (!test_bit (WMI_TLV_SERVICE_BSS_CHANNEL_INFO_64 , ar->ab->wmi_sc.svc_map) || +if (!test_bit (WMI_TLV_SERVICE_BSS_CHANNEL_INFO_64 , ar->ab->wmi_ab.svc_map) || ar->rx_channel != channel)return ;
@@ -5713,7 +5713,7 @@ int ath11k_mac_create(struct ath11k_base *ab) ar->pdev_idx = i; ar->lmac_id =ath11k_core_get_hw_mac_id (ab, i); - ar->wmi = &ab->wmi_sc.wmi[i]; + ar->wmi = &ab->wmi_ab.wmi[i];/* FIXME wmi[0] is already initialized during attach, * Should we do this again? */
drivers/net/wireless/ath/ath11k/testmode.c +1 -1
@@ -150,7 +150,7 @@ static int ath11k_tm_cmd_wmi(struct ath11k *ar, struct nlattr *tb[])ath11k_dbg_dump (ar->ab,ATH11K_DBG_TESTMODE ,NULL ,"" , buf, buf_len); - skb =ath11k_wmi_alloc_skb (wmi->wmi_sc, buf_len); + skb =ath11k_wmi_alloc_skb (wmi->wmi_ab, buf_len);if (!skb) { ret = -ENOMEM ; goto out;
drivers/net/wireless/ath/ath11k/wmi.c +73 -73
541 lines not on this page · raw message
drivers/net/wireless/ath/ath11k/wmi.h +1 -1
@@ -2354,7 +2354,7 @@ struct wmi_service_available_event { } __packed;struct ath11k_pdev_wmi { -struct ath11k_wmi_base *wmi_sc; +struct ath11k_wmi_base *wmi_ab;enum ath11k_htc_ep_id eid;const struct wmi_peer_flags_map *peer_flags;u32 rx_decap_mode;
Signature · 7 lines
2.20.1 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k