]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
wifi: ath12k: fix misspelling of "dma" in num_rxmda_per_pdev
authorJeff Johnson <quic_jjohnson@quicinc.com>
Sat, 4 May 2024 21:45:17 +0000 (14:45 -0700)
committerKalle Valo <quic_kvalo@quicinc.com>
Mon, 13 May 2024 14:14:39 +0000 (17:14 +0300)
The ath12k_hw_params member num_rxmda_per_pdev contains a misspelling
of "dma" so fix it.

No functional changes, compile tested only.

Signed-off-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://msgid.link/20240504-ath12k_dp_rxdma_ring_sel_config_wcn7850-ret-v1-1-44d2843a2857@quicinc.com
drivers/net/wireless/ath/ath12k/dp.c
drivers/net/wireless/ath/ath12k/dp_rx.c
drivers/net/wireless/ath/ath12k/dp_tx.c
drivers/net/wireless/ath/ath12k/hw.c
drivers/net/wireless/ath/ath12k/hw.h
drivers/net/wireless/ath/ath12k/wmi.c

index ca41f44313948f2aefe56b0f41a96d30cffa513c..412ab08e6cca2d39e5da17b1b15b5c230bcee3b4 100644 (file)
@@ -907,8 +907,8 @@ int ath12k_dp_service_srng(struct ath12k_base *ab,
                monitor_mode = ATH12K_DP_RX_MONITOR_MODE;
                ring_mask = ab->hw_params->ring_mask->rx_mon_dest[grp_id];
                for (i = 0; i < ab->num_radios; i++) {
-                       for (j = 0; j < ab->hw_params->num_rxmda_per_pdev; j++) {
-                               int id = i * ab->hw_params->num_rxmda_per_pdev + j;
+                       for (j = 0; j < ab->hw_params->num_rxdma_per_pdev; j++) {
+                               int id = i * ab->hw_params->num_rxdma_per_pdev + j;
 
                                if (ring_mask & BIT(id)) {
                                        work_done =
@@ -928,8 +928,8 @@ int ath12k_dp_service_srng(struct ath12k_base *ab,
                monitor_mode = ATH12K_DP_TX_MONITOR_MODE;
                ring_mask = ab->hw_params->ring_mask->tx_mon_dest[grp_id];
                for (i = 0; i < ab->num_radios; i++) {
-                       for (j = 0; j < ab->hw_params->num_rxmda_per_pdev; j++) {
-                               int id = i * ab->hw_params->num_rxmda_per_pdev + j;
+                       for (j = 0; j < ab->hw_params->num_rxdma_per_pdev; j++) {
+                               int id = i * ab->hw_params->num_rxdma_per_pdev + j;
 
                                if (ring_mask & BIT(id)) {
                                        work_done =
@@ -1017,7 +1017,7 @@ static void ath12k_dp_service_mon_ring(struct timer_list *t)
        struct ath12k_base *ab = from_timer(ab, t, mon_reap_timer);
        int i;
 
-       for (i = 0; i < ab->hw_params->num_rxmda_per_pdev; i++)
+       for (i = 0; i < ab->hw_params->num_rxdma_per_pdev; i++)
                ath12k_dp_mon_process_ring(ab, i, NULL, DP_MON_SERVICE_BUDGET,
                                           ATH12K_DP_RX_MONITOR_MODE);
 
index 952a377b5491176ce34599f69c7b4c4ba1b2e89d..e3ff14cd283f79e1565d35b0f3d998dda0f49d50 100644 (file)
@@ -485,7 +485,7 @@ static void ath12k_dp_rx_pdev_srng_free(struct ath12k *ar)
        struct ath12k_base *ab = ar->ab;
        int i;
 
-       for (i = 0; i < ab->hw_params->num_rxmda_per_pdev; i++)
+       for (i = 0; i < ab->hw_params->num_rxdma_per_pdev; i++)
                ath12k_dp_srng_cleanup(ab, &dp->rxdma_mon_dst_ring[i]);
 }
 
@@ -530,7 +530,7 @@ static int ath12k_dp_rx_pdev_srng_alloc(struct ath12k *ar)
        int ret;
        u32 mac_id = dp->mac_id;
 
-       for (i = 0; i < ab->hw_params->num_rxmda_per_pdev; i++) {
+       for (i = 0; i < ab->hw_params->num_rxdma_per_pdev; i++) {
                ret = ath12k_dp_srng_setup(ar->ab,
                                           &dp->rxdma_mon_dst_ring[i],
                                           HAL_RXDMA_MONITOR_DST,
@@ -3938,7 +3938,7 @@ void ath12k_dp_rx_free(struct ath12k_base *ab)
 
        ath12k_dp_srng_cleanup(ab, &dp->rx_refill_buf_ring.refill_buf_ring);
 
-       for (i = 0; i < ab->hw_params->num_rxmda_per_pdev; i++) {
+       for (i = 0; i < ab->hw_params->num_rxdma_per_pdev; i++) {
                if (ab->hw_params->rx_mac_buf_ring)
                        ath12k_dp_srng_cleanup(ab, &dp->rx_mac_buf_ring[i]);
        }
@@ -4030,7 +4030,7 @@ int ath12k_dp_rxdma_ring_sel_config_wcn7850(struct ath12k_base *ab)
         * and modify the rx_desc struct
         */
 
-       for (i = 0; i < ab->hw_params->num_rxmda_per_pdev; i++) {
+       for (i = 0; i < ab->hw_params->num_rxdma_per_pdev; i++) {
                ring_id = dp->rx_mac_buf_ring[i].ring_id;
                ret = ath12k_dp_tx_htt_rx_filter_setup(ab, ring_id, i,
                                                       HAL_RXDMA_BUF,
@@ -4057,7 +4057,7 @@ int ath12k_dp_rx_htt_setup(struct ath12k_base *ab)
        }
 
        if (ab->hw_params->rx_mac_buf_ring) {
-               for (i = 0; i < ab->hw_params->num_rxmda_per_pdev; i++) {
+               for (i = 0; i < ab->hw_params->num_rxdma_per_pdev; i++) {
                        ring_id = dp->rx_mac_buf_ring[i].ring_id;
                        ret = ath12k_dp_tx_htt_srng_setup(ab, ring_id,
                                                          i, HAL_RXDMA_BUF);
@@ -4118,7 +4118,7 @@ int ath12k_dp_rx_alloc(struct ath12k_base *ab)
        }
 
        if (ab->hw_params->rx_mac_buf_ring) {
-               for (i = 0; i < ab->hw_params->num_rxmda_per_pdev; i++) {
+               for (i = 0; i < ab->hw_params->num_rxdma_per_pdev; i++) {
                        ret = ath12k_dp_srng_setup(ab,
                                                   &dp->rx_mac_buf_ring[i],
                                                   HAL_RXDMA_BUF, 1,
@@ -4178,7 +4178,7 @@ int ath12k_dp_rx_pdev_alloc(struct ath12k_base *ab, int mac_id)
                return ret;
        }
 
-       for (i = 0; i < ab->hw_params->num_rxmda_per_pdev; i++) {
+       for (i = 0; i < ab->hw_params->num_rxdma_per_pdev; i++) {
                ring_id = dp->rxdma_mon_dst_ring[i].ring_id;
                ret = ath12k_dp_tx_htt_srng_setup(ab, ring_id,
                                                  mac_id + i,
index a22fa43c87ec5385649ad99595a0b787065324db..32496015cf9a14455456f9f199c04adc2ae4c2d1 100644 (file)
@@ -865,7 +865,7 @@ int ath12k_dp_tx_htt_h2t_ppdu_stats_req(struct ath12k *ar, u32 mask)
        int ret;
        int i;
 
-       for (i = 0; i < ab->hw_params->num_rxmda_per_pdev; i++) {
+       for (i = 0; i < ab->hw_params->num_rxdma_per_pdev; i++) {
                skb = ath12k_htc_alloc_skb(ab, len);
                if (!skb)
                        return -ENOMEM;
index f4c827015821573d53b9c1da39444815ad9aac62..06f44321648860b1c0afb2f8027960c209ca6454 100644 (file)
@@ -884,7 +884,7 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
                .hal_params = &ath12k_hw_hal_params_qcn9274,
 
                .rxdma1_enable = false,
-               .num_rxmda_per_pdev = 1,
+               .num_rxdma_per_pdev = 1,
                .num_rxdma_dst_ring = 0,
                .rx_mac_buf_ring = false,
                .vdev_start_delay = false,
@@ -956,7 +956,7 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
                .hal_params = &ath12k_hw_hal_params_wcn7850,
 
                .rxdma1_enable = false,
-               .num_rxmda_per_pdev = 2,
+               .num_rxdma_per_pdev = 2,
                .num_rxdma_dst_ring = 1,
                .rx_mac_buf_ring = true,
                .vdev_start_delay = true,
@@ -1029,7 +1029,7 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
                .hal_params = &ath12k_hw_hal_params_qcn9274,
 
                .rxdma1_enable = false,
-               .num_rxmda_per_pdev = 1,
+               .num_rxdma_per_pdev = 1,
                .num_rxdma_dst_ring = 0,
                .rx_mac_buf_ring = false,
                .vdev_start_delay = false,
index 3f450ee93f34bbb9463619c332a95519beb72747..2a5a9d638d9344ba4dcc494f25f7d56f19b23db9 100644 (file)
@@ -174,7 +174,7 @@ struct ath12k_hw_params {
        const struct ath12k_hw_hal_params *hal_params;
 
        bool rxdma1_enable:1;
-       int num_rxmda_per_pdev;
+       int num_rxdma_per_pdev;
        int num_rxdma_dst_ring;
        bool rx_mac_buf_ring:1;
        bool vdev_start_delay:1;
index 9e9f58b5cbfb0ac75303bad91e22a4689c98e557..3004c7463be99a8ef9712f1fb893ff0050a33b2f 100644 (file)
@@ -5693,7 +5693,7 @@ static int ath12k_reg_chan_list_event(struct ath12k_base *ab, struct sk_buff *sk
                 * event. Otherwise, it goes to fallback.
                 */
                if (ab->hw_params->single_pdev_only &&
-                   pdev_idx < ab->hw_params->num_rxmda_per_pdev)
+                   pdev_idx < ab->hw_params->num_rxdma_per_pdev)
                        goto mem_free;
                else
                        goto fallback;