ath6kl: break stats gathering code into separate method

This will allow us to call it from elsewhere when implementing
ethtool stats.

Signed-off-by: Ben Greear <greearb@candelatech.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath6kl/debug.c b/drivers/net/wireless/ath/ath6kl/debug.c
index 81ba48d2938b2cfc3f11d22e6fb723a8f03f82e5..e2b7809d7886706994d1bffa30c5726e1bde6142 100644 (file)
--- a/drivers/net/wireless/ath/ath6kl/debug.c
+++ b/drivers/net/wireless/ath/ath6kl/debug.c
@@ -98,6 +98,33 @@ void ath6kl_warn(const char *fmt, ...)
 }
 EXPORT_SYMBOL(ath6kl_warn);
 
+int ath6kl_read_tgt_stats(struct ath6kl *ar, struct ath6kl_vif *vif)
+{
+       long left;
+
+       if (down_interruptible(&ar->sem))
+               return -EBUSY;
+
+       set_bit(STATS_UPDATE_PEND, &vif->flags);
+
+       if (ath6kl_wmi_get_stats_cmd(ar->wmi, 0)) {
+               up(&ar->sem);
+               return -EIO;
+       }
+
+       left = wait_event_interruptible_timeout(ar->event_wq,
+                                               !test_bit(STATS_UPDATE_PEND,
+                                               &vif->flags), WMI_TIMEOUT);
+
+       up(&ar->sem);
+
+       if (left <= 0)
+               return -ETIMEDOUT;
+
+       return 0;
+}
+EXPORT_SYMBOL(ath6kl_read_tgt_stats);
+
 #ifdef CONFIG_ATH6KL_DEBUG
 
 void ath6kl_dbg(enum ATH6K_DEBUG_MASK mask, const char *fmt, ...)
@@ -544,42 +571,24 @@ static ssize_t read_file_tgt_stats(struct file *file, char __user *user_buf,
        char *buf;
        unsigned int len = 0, buf_len = 1500;
        int i;
-       long left;
        ssize_t ret_cnt;
+       int rv;
 
        vif = ath6kl_vif_first(ar);
        if (!vif)
                return -EIO;
 
-       tgt_stats = &vif->target_stats;
-
        buf = kzalloc(buf_len, GFP_KERNEL);
        if (!buf)
                return -ENOMEM;
 
-       if (down_interruptible(&ar->sem)) {
+       rv = ath6kl_read_tgt_stats(ar, vif);
+       if (rv < 0) {
                kfree(buf);
-               return -EBUSY;
+               return rv;
        }
 
-       set_bit(STATS_UPDATE_PEND, &vif->flags);
-
-       if (ath6kl_wmi_get_stats_cmd(ar->wmi, 0)) {
-               up(&ar->sem);
-               kfree(buf);
-               return -EIO;
-       }
-
-       left = wait_event_interruptible_timeout(ar->event_wq,
-                                               !test_bit(STATS_UPDATE_PEND,
-                                               &vif->flags), WMI_TIMEOUT);
-
-       up(&ar->sem);
-
-       if (left <= 0) {
-               kfree(buf);
-               return -ETIMEDOUT;
-       }
+       tgt_stats = &vif->target_stats;
 
        len += scnprintf(buf + len, buf_len - len, "\n");
        len += scnprintf(buf + len, buf_len - len, "%25s\n",

diff --git a/drivers/net/wireless/ath/ath6kl/debug.h b/drivers/net/wireless/ath/ath6kl/debug.h
index 19106ed28961643870d36d95456ee80b3af6ec18..0614393dd7ae7c1f6f3de79bce6ecf3338082592 100644 (file)
--- a/drivers/net/wireless/ath/ath6kl/debug.h
+++ b/drivers/net/wireless/ath/ath6kl/debug.h
@@ -59,6 +59,8 @@ enum ath6kl_war {
        ATH6KL_WAR_INVALID_RATE,
 };
 
+int ath6kl_read_tgt_stats(struct ath6kl *ar, struct ath6kl_vif *vif);
+
 #ifdef CONFIG_ATH6KL_DEBUG
 
 void ath6kl_dbg(enum ATH6K_DEBUG_MASK mask, const char *fmt, ...);