ath9k_htc: Use power save wrappers when accessing HW

Signed-off-by: Sujith Manoharan <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

2 files changed, 23 insertions, 3 deletions

diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_debug.c b/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
index eca777497fe5..894e5ef3f8d1 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
@@ -33,9 +33,15 @@ static ssize_t read_file_tgt_int_stats(struct file *file, char __user *user_buf,
 
         memset(&cmd_rsp, 0, sizeof(cmd_rsp));
 
+        ath9k_htc_ps_wakeup(priv);
+
         WMI_CMD(WMI_INT_STATS_CMDID);
-        if (ret)
+        if (ret) {
+                ath9k_htc_ps_restore(priv);
                 return -EINVAL;
+        }
+
+        ath9k_htc_ps_restore(priv);
 
         len += snprintf(buf + len, sizeof(buf) - len,
                         "%20s : %10u\n", "RX",
@@ -85,9 +91,15 @@ static ssize_t read_file_tgt_tx_stats(struct file *file, char __user *user_buf,
 
         memset(&cmd_rsp, 0, sizeof(cmd_rsp));
 
+        ath9k_htc_ps_wakeup(priv);
+
         WMI_CMD(WMI_TX_STATS_CMDID);
-        if (ret)
+        if (ret) {
+                ath9k_htc_ps_restore(priv);
                 return -EINVAL;
+        }
+
+        ath9k_htc_ps_restore(priv);
 
         len += snprintf(buf + len, sizeof(buf) - len,
                         "%20s : %10u\n", "Xretries",
@@ -149,9 +161,15 @@ static ssize_t read_file_tgt_rx_stats(struct file *file, char __user *user_buf,
 
         memset(&cmd_rsp, 0, sizeof(cmd_rsp));
 
+        ath9k_htc_ps_wakeup(priv);
+
         WMI_CMD(WMI_RX_STATS_CMDID);
-        if (ret)
+        if (ret) {
+                ath9k_htc_ps_restore(priv);
                 return -EINVAL;
+        }
+
+        ath9k_htc_ps_restore(priv);
 
         len += snprintf(buf + len, sizeof(buf) - len,
                         "%20s : %10u\n", "NoBuf",
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
index fbc238a0b203..c8577d5cd0f7 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
@@ -1582,6 +1582,7 @@ static int ath9k_htc_ampdu_action(struct ieee80211_hw *hw,
         int ret = 0;
 
         mutex_lock(&priv->mutex);
+        ath9k_htc_ps_wakeup(priv);
 
         switch (action) {
         case IEEE80211_AMPDU_RX_START:
@@ -1607,6 +1608,7 @@ static int ath9k_htc_ampdu_action(struct ieee80211_hw *hw,
                 ath_err(ath9k_hw_common(priv->ah), "Unknown AMPDU action\n");
         }
 
+        ath9k_htc_ps_restore(priv);
         mutex_unlock(&priv->mutex);
 
         return ret;