Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c58ca5b5 authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville
Browse files

ath9k_htc: Use power save wrappers when accessing HW 



Signed-off-by: default avatarSujith Manoharan <Sujith.Manoharan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f0dd4980

drivers/net/wireless/ath/ath9k/htc_drv_debug.c

+21 −3
Original line number Original line Diff line number Diff line
@@ -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));

	memset(&cmd_rsp, 0, sizeof(cmd_rsp));





	ath9k_htc_ps_wakeup(priv);



	WMI_CMD(WMI_INT_STATS_CMDID);

	WMI_CMD(WMI_INT_STATS_CMDID);

	if (ret)

	if (ret) {

		ath9k_htc_ps_restore(priv);

		return -EINVAL;

		return -EINVAL;

	}



	ath9k_htc_ps_restore(priv);





	len += snprintf(buf + len, sizeof(buf) - len,

	len += snprintf(buf + len, sizeof(buf) - len,

			"%20s : %10u\n", "RX",

			"%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));

	memset(&cmd_rsp, 0, sizeof(cmd_rsp));





	ath9k_htc_ps_wakeup(priv);



	WMI_CMD(WMI_TX_STATS_CMDID);

	WMI_CMD(WMI_TX_STATS_CMDID);

	if (ret)

	if (ret) {

		ath9k_htc_ps_restore(priv);

		return -EINVAL;

		return -EINVAL;

	}



	ath9k_htc_ps_restore(priv);





	len += snprintf(buf + len, sizeof(buf) - len,

	len += snprintf(buf + len, sizeof(buf) - len,

			"%20s : %10u\n", "Xretries",

			"%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));

	memset(&cmd_rsp, 0, sizeof(cmd_rsp));





	ath9k_htc_ps_wakeup(priv);



	WMI_CMD(WMI_RX_STATS_CMDID);

	WMI_CMD(WMI_RX_STATS_CMDID);

	if (ret)

	if (ret) {

		ath9k_htc_ps_restore(priv);

		return -EINVAL;

		return -EINVAL;

	}



	ath9k_htc_ps_restore(priv);





	len += snprintf(buf + len, sizeof(buf) - len,

	len += snprintf(buf + len, sizeof(buf) - len,

			"%20s : %10u\n", "NoBuf",

			"%20s : %10u\n", "NoBuf",

drivers/net/wireless/ath/ath9k/htc_drv_main.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1582,6 +1582,7 @@ static int ath9k_htc_ampdu_action(struct ieee80211_hw *hw, 
	int ret = 0;

	int ret = 0;





	mutex_lock(&priv->mutex);

	mutex_lock(&priv->mutex);

	ath9k_htc_ps_wakeup(priv);





	switch (action) {

	switch (action) {

	case IEEE80211_AMPDU_RX_START:

	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");

		ath_err(ath9k_hw_common(priv->ah), "Unknown AMPDU action\n");

	}

	}





	ath9k_htc_ps_restore(priv);

	mutex_unlock(&priv->mutex);

	mutex_unlock(&priv->mutex);





	return ret;

	return ret;