Skip to content

Commit 25ebf4c

Browse files
Karthikeyan Periyasamykvalo
authored andcommitted
wifi: ath12k: rename the wmi_sc naming convention to wmi_ab
In WMI layer module, the identifier wmi_sc is used to represent an instance of ath12k_wmi_base structure. However, within ath12k, the convention is to use "ab" to represent an SoC "base" struct. So change the all instances of wmi_sc to wmi_ab. Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00125-QCAHKSWPL_SILICONZ-1 Signed-off-by: Karthikeyan Periyasamy <quic_periyasa@quicinc.com> Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com> Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com> Link: https://lore.kernel.org/r/20231018153008.29820-2-quic_periyasa@quicinc.com
1 parent 7db88b9 commit 25ebf4c

File tree

1 file changed

+11
-11
lines changed
  • drivers/net/wireless/ath/ath12k

1 file changed

+11
-11
lines changed

drivers/net/wireless/ath/ath12k/wmi.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -408,22 +408,22 @@ static int ath12k_wmi_cmd_send_nowait(struct ath12k_wmi_pdev *wmi, struct sk_buf
408408
int ath12k_wmi_cmd_send(struct ath12k_wmi_pdev *wmi, struct sk_buff *skb,
409409
u32 cmd_id)
410410
{
411-
struct ath12k_wmi_base *wmi_sc = wmi->wmi_ab;
411+
struct ath12k_wmi_base *wmi_ab = wmi->wmi_ab;
412412
int ret = -EOPNOTSUPP;
413413

414414
might_sleep();
415415

416-
wait_event_timeout(wmi_sc->tx_credits_wq, ({
416+
wait_event_timeout(wmi_ab->tx_credits_wq, ({
417417
ret = ath12k_wmi_cmd_send_nowait(wmi, skb, cmd_id);
418418

419-
if (ret && test_bit(ATH12K_FLAG_CRASH_FLUSH, &wmi_sc->ab->dev_flags))
419+
if (ret && test_bit(ATH12K_FLAG_CRASH_FLUSH, &wmi_ab->ab->dev_flags))
420420
ret = -ESHUTDOWN;
421421

422422
(ret != -EAGAIN);
423423
}), WMI_SEND_TIMEOUT_HZ);
424424

425425
if (ret == -EAGAIN)
426-
ath12k_warn(wmi_sc->ab, "wmi command %d timeout\n", cmd_id);
426+
ath12k_warn(wmi_ab->ab, "wmi command %d timeout\n", cmd_id);
427427

428428
return ret;
429429
}
@@ -727,10 +727,10 @@ static int ath12k_service_ready_event(struct ath12k_base *ab, struct sk_buff *sk
727727
return 0;
728728
}
729729

730-
struct sk_buff *ath12k_wmi_alloc_skb(struct ath12k_wmi_base *wmi_sc, u32 len)
730+
struct sk_buff *ath12k_wmi_alloc_skb(struct ath12k_wmi_base *wmi_ab, u32 len)
731731
{
732732
struct sk_buff *skb;
733-
struct ath12k_base *ab = wmi_sc->ab;
733+
struct ath12k_base *ab = wmi_ab->ab;
734734
u32 round_len = roundup(len, 4);
735735

736736
skb = ath12k_htc_alloc_skb(ab, WMI_SKB_HEADROOM + round_len);
@@ -3471,7 +3471,7 @@ int ath12k_wmi_set_hw_mode(struct ath12k_base *ab,
34713471

34723472
int ath12k_wmi_cmd_init(struct ath12k_base *ab)
34733473
{
3474-
struct ath12k_wmi_base *wmi_sc = &ab->wmi_ab;
3474+
struct ath12k_wmi_base *wmi_ab = &ab->wmi_ab;
34753475
struct ath12k_wmi_init_cmd_arg arg = {};
34763476

34773477
if (test_bit(WMI_TLV_SERVICE_REG_CC_EXT_EVENT_SUPPORT,
@@ -3480,17 +3480,17 @@ int ath12k_wmi_cmd_init(struct ath12k_base *ab)
34803480

34813481
ab->hw_params->wmi_init(ab, &arg.res_cfg);
34823482

3483-
arg.num_mem_chunks = wmi_sc->num_mem_chunks;
3484-
arg.hw_mode_id = wmi_sc->preferred_hw_mode;
3485-
arg.mem_chunks = wmi_sc->mem_chunks;
3483+
arg.num_mem_chunks = wmi_ab->num_mem_chunks;
3484+
arg.hw_mode_id = wmi_ab->preferred_hw_mode;
3485+
arg.mem_chunks = wmi_ab->mem_chunks;
34863486

34873487
if (ab->hw_params->single_pdev_only)
34883488
arg.hw_mode_id = WMI_HOST_HW_MODE_MAX;
34893489

34903490
arg.num_band_to_mac = ab->num_radios;
34913491
ath12k_fill_band_to_mac_param(ab, arg.band_to_mac);
34923492

3493-
return ath12k_init_cmd_send(&wmi_sc->wmi[0], &arg);
3493+
return ath12k_init_cmd_send(&wmi_ab->wmi[0], &arg);
34943494
}
34953495

34963496
int ath12k_wmi_vdev_spectral_conf(struct ath12k *ar,

0 commit comments

Comments
 (0)