wifi: ath10k: Use list_count_nodes()

ath10k_wmi_fw_stats_num_peers() and ath10k_wmi_fw_stats_num_vdevs() really
look the same as list_count_nodes(), so use the latter instead of hand
writing it.

The first ones use list_for_each_entry() and the other list_for_each(), but
they both count the number of nodes in the list.

Compile tested only.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/e6ec525c0c5057e97e33a63f8a4aa482e5c2da7f.1682541872.git.christophe.jaillet@wanadoo.fr

diff --git a/drivers/net/wireless/ath/ath10k/debug.c b/drivers/net/wireless/ath/ath10k/debug.c
index b9aea15..f9518e1 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/debug.c
+++ b/drivers/net/wireless/ath/ath10k/debug.c
@@ -293,8 +293,8 @@ void ath10k_debug_fw_stats_process(struct ath10k *ar, struct sk_buff *skb)
                goto free;
        }
 
-       num_peers = ath10k_wmi_fw_stats_num_peers(&ar->debug.fw_stats.peers);
-       num_vdevs = ath10k_wmi_fw_stats_num_vdevs(&ar->debug.fw_stats.vdevs);
+       num_peers = list_count_nodes(&ar->debug.fw_stats.peers);
+       num_vdevs = list_count_nodes(&ar->debug.fw_stats.vdevs);
        is_start = (list_empty(&ar->debug.fw_stats.pdevs) &&
                    !list_empty(&stats.pdevs));
        is_end = (!list_empty(&ar->debug.fw_stats.pdevs) &&

diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
index 980d412..05fa7d4 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -8164,28 +8164,6 @@ ath10k_wmi_10_2_4_op_gen_pdev_get_tpc_config(struct ath10k *ar, u32 param)
        return skb;
 }
 
-size_t ath10k_wmi_fw_stats_num_peers(struct list_head *head)
-{
-       struct ath10k_fw_stats_peer *i;
-       size_t num = 0;
-
-       list_for_each_entry(i, head, list)
-               ++num;
-
-       return num;
-}
-
-size_t ath10k_wmi_fw_stats_num_vdevs(struct list_head *head)
-{
-       struct ath10k_fw_stats_vdev *i;
-       size_t num = 0;
-
-       list_for_each_entry(i, head, list)
-               ++num;
-
-       return num;
-}
-
 static void
 ath10k_wmi_fw_pdev_base_stats_fill(const struct ath10k_fw_stats_pdev *pdev,
                                   char *buf, u32 *length)
@@ -8462,8 +8440,8 @@ void ath10k_wmi_main_op_fw_stats_fill(struct ath10k *ar,
                goto unlock;
        }
 
-       num_peers = ath10k_wmi_fw_stats_num_peers(&fw_stats->peers);
-       num_vdevs = ath10k_wmi_fw_stats_num_vdevs(&fw_stats->vdevs);
+       num_peers = list_count_nodes(&fw_stats->peers);
+       num_vdevs = list_count_nodes(&fw_stats->vdevs);
 
        ath10k_wmi_fw_pdev_base_stats_fill(pdev, buf, &len);
        ath10k_wmi_fw_pdev_tx_stats_fill(pdev, buf, &len);
@@ -8520,8 +8498,8 @@ void ath10k_wmi_10x_op_fw_stats_fill(struct ath10k *ar,
                goto unlock;
        }
 
-       num_peers = ath10k_wmi_fw_stats_num_peers(&fw_stats->peers);
-       num_vdevs = ath10k_wmi_fw_stats_num_vdevs(&fw_stats->vdevs);
+       num_peers = list_count_nodes(&fw_stats->peers);
+       num_vdevs = list_count_nodes(&fw_stats->vdevs);
 
        ath10k_wmi_fw_pdev_base_stats_fill(pdev, buf, &len);
        ath10k_wmi_fw_pdev_extra_stats_fill(pdev, buf, &len);
@@ -8668,8 +8646,8 @@ void ath10k_wmi_10_4_op_fw_stats_fill(struct ath10k *ar,
                goto unlock;
        }
 
-       num_peers = ath10k_wmi_fw_stats_num_peers(&fw_stats->peers);
-       num_vdevs = ath10k_wmi_fw_stats_num_vdevs(&fw_stats->vdevs);
+       num_peers = list_count_nodes(&fw_stats->peers);
+       num_vdevs = list_count_nodes(&fw_stats->vdevs);
 
        ath10k_wmi_fw_pdev_base_stats_fill(pdev, buf, &len);
        ath10k_wmi_fw_pdev_extra_stats_fill(pdev, buf, &len);

diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h
index 6de3cc4..6d04a66 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/wmi.h
+++ b/drivers/net/wireless/ath/ath10k/wmi.h
@@ -7502,8 +7502,6 @@ void ath10k_wmi_main_op_fw_stats_fill(struct ath10k *ar,
 void ath10k_wmi_10x_op_fw_stats_fill(struct ath10k *ar,
                                     struct ath10k_fw_stats *fw_stats,
                                     char *buf);
-size_t ath10k_wmi_fw_stats_num_peers(struct list_head *head);
-size_t ath10k_wmi_fw_stats_num_vdevs(struct list_head *head);
 void ath10k_wmi_10_4_op_fw_stats_fill(struct ath10k *ar,
                                      struct ath10k_fw_stats *fw_stats,
                                      char *buf);