From: Felix Fietkau <nbd@openwrt.org>
To: linux-wireless@vger.kernel.org
Cc: linville@tuxdriver.com, mcgrof@qca.qualcomm.com
Subject: [PATCH 03/14] ath9k_hw: remove ath9k_hw_htc_resetinit
Date: Wed, 14 Mar 2012 16:40:23 +0100 [thread overview]
Message-ID: <1331739634-22318-3-git-send-email-nbd@openwrt.org> (raw)
In-Reply-To: <1331739634-22318-2-git-send-email-nbd@openwrt.org>
Automatically set the ah->htc_reset_init on init and after PHY disable.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
---
drivers/net/wireless/ath/ath9k/htc_drv_main.c | 1 -
drivers/net/wireless/ath/ath9k/hw.c | 8 ++------
drivers/net/wireless/ath/ath9k/hw.h | 3 ---
3 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
index 2a29a7c..2b8f61c 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
@@ -919,7 +919,6 @@ static int ath9k_htc_start(struct ieee80211_hw *hw)
/* setup initial channel */
init_channel = ath9k_cmn_get_curchannel(hw, ah);
- ath9k_hw_htc_resetinit(ah);
ret = ath9k_hw_reset(ah, init_channel, ah->caldata, false);
if (ret) {
ath_err(common,
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 02cc1ce..5bd872f 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -449,6 +449,7 @@ static void ath9k_hw_init_defaults(struct ath_hw *ah)
ah->slottime = ATH9K_SLOT_TIME_9;
ah->globaltxtimeout = (u32) -1;
ah->power_mode = ATH9K_PM_UNDEFINED;
+ ah->htc_reset_init = true;
}
static int ath9k_hw_init_macaddr(struct ath_hw *ah)
@@ -2589,6 +2590,7 @@ bool ath9k_hw_phy_disable(struct ath_hw *ah)
return false;
ath9k_hw_init_pll(ah, NULL);
+ ah->htc_reset_init = true;
return true;
}
EXPORT_SYMBOL(ath9k_hw_phy_disable);
@@ -2949,12 +2951,6 @@ EXPORT_SYMBOL(ath_gen_timer_isr);
/* HTC */
/********/
-void ath9k_hw_htc_resetinit(struct ath_hw *ah)
-{
- ah->htc_reset_init = true;
-}
-EXPORT_SYMBOL(ath9k_hw_htc_resetinit);
-
static struct {
u32 version;
const char * name;
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index 1707137..a703423 100644
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -988,9 +988,6 @@ void ath_gen_timer_isr(struct ath_hw *hw);
void ath9k_hw_name(struct ath_hw *ah, char *hw_name, size_t len);
-/* HTC */
-void ath9k_hw_htc_resetinit(struct ath_hw *ah);
-
/* PHY */
void ath9k_hw_get_delta_slope_vals(struct ath_hw *ah, u32 coef_scaled,
u32 *coef_mantissa, u32 *coef_exponent);
--
1.7.3.2
next prev parent reply other threads:[~2012-03-14 15:40 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-14 15:40 [PATCH 01/14] ath9k_hw: simplify tx queue interrupt mask handling Felix Fietkau
2012-03-14 15:40 ` [PATCH 02/14] ath9k_hw: clean up tx completion interrupt handling Felix Fietkau
2012-03-14 15:40 ` Felix Fietkau [this message]
2012-03-14 15:40 ` [PATCH 04/14] ath9k_hw: remove ath9k_hw_getdefantenna Felix Fietkau
2012-03-14 15:40 ` [PATCH 05/14] ath9k: optimize register access functions Felix Fietkau
2012-03-14 15:40 ` [PATCH 06/14] ath9k_hw: remove ath9k_hw_gettxintrtxqs Felix Fietkau
2012-03-14 15:40 ` [PATCH 07/14] ath9k_hw: clean up ath9k_hw_setuprxdesc Felix Fietkau
2012-03-14 15:40 ` [PATCH 08/14] ath9k_hw: remove iniCommon_*_cck_fir_coeff_9271 Felix Fietkau
2012-03-14 15:40 ` [PATCH 09/14] ath9k_hw: fold ar9002_hw_cck_chan14_spread into mode regs initialization Felix Fietkau
2012-03-14 15:40 ` [PATCH 10/14] ath9k_hw: fix AR9380 register settings for channel 14 Felix Fietkau
2012-03-14 15:40 ` [PATCH 11/14] ath9k_hw: clean up iniModesAdditional Felix Fietkau
2012-03-14 15:40 ` [PATCH 12/14] ath9k_hw: remove iniModes_*_tx_gain_9271 Felix Fietkau
2012-03-14 15:40 ` [PATCH 13/14] ath9k: inline AR9271 1.0 INI overrides Felix Fietkau
2012-03-14 15:40 ` [PATCH 14/14] ath9k_hw: remove unused initvals Felix Fietkau
2012-03-15 5:52 ` [PATCH 03/14] ath9k_hw: remove ath9k_hw_htc_resetinit Sujith Manoharan
2012-03-15 8:15 ` Felix Fietkau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1331739634-22318-3-git-send-email-nbd@openwrt.org \
--to=nbd@openwrt.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=mcgrof@qca.qualcomm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).