Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-30 06:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

ath5k: merge ath5k_{init, deinit}_hw() with their thin wrappers

Browse Source 
Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Pavel Roskin 2011-07-21 13:36:28 -04:00 committed by John W. Linville
parent 24aad3f4c8
commit fabba04806
3 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/ath/ath5k/ath5k.h
View File

@ -1372,8 +1372,8 @@ void ath5k_set_beacon_filter(struct ieee80211_hw *hw, bool enable);
bool ath5k_any_vif_assoc(struct ath5k_hw *ah); bool ath5k_any_vif_assoc(struct ath5k_hw *ah);
void ath5k_tx_queue(struct ieee80211_hw *hw, struct sk_buff *skb, void ath5k_tx_queue(struct ieee80211_hw *hw, struct sk_buff *skb,
struct ath5k_txq *txq); struct ath5k_txq *txq);
int ath5k_init_hw(struct ath5k_hw *ah); int ath5k_start(struct ieee80211_hw *hw);
int ath5k_stop_hw(struct ath5k_hw *ah); void ath5k_stop(struct ieee80211_hw *hw);
void ath5k_mode_setup(struct ath5k_hw *ah, struct ieee80211_vif *vif); void ath5k_mode_setup(struct ath5k_hw *ah, struct ieee80211_vif *vif);
void ath5k_update_bssid_mask_and_opmode(struct ath5k_hw *ah, void ath5k_update_bssid_mask_and_opmode(struct ath5k_hw *ah,
struct ieee80211_vif *vif); struct ieee80211_vif *vif);

10
drivers/net/wireless/ath/ath5k/base.c
View File

@ -2526,9 +2526,9 @@ ath5k_stop_locked(struct ath5k_hw *ah)
return 0; return 0;
} }
int int ath5k_start(struct ieee80211_hw *hw)
ath5k_init_hw(struct ath5k_hw *ah)
{ {
struct ath5k_hw *ah = hw->priv;
struct ath_common *common = ath5k_hw_common(ah); struct ath_common *common = ath5k_hw_common(ah);
int ret, i; int ret, i;
@ -2602,9 +2602,9 @@ static void ath5k_stop_tasklets(struct ath5k_hw *ah)
* if another thread does a system call and the thread doing the * if another thread does a system call and the thread doing the
* stop is preempted). * stop is preempted).
*/ */
int void ath5k_stop(struct ieee80211_hw *hw)
ath5k_stop_hw(struct ath5k_hw *ah)
{ {
struct ath5k_hw *ah = hw->priv;
int ret; int ret;
mutex_lock(&ah->lock); mutex_lock(&ah->lock);
@ -2644,8 +2644,6 @@ ath5k_stop_hw(struct ath5k_hw *ah)
cancel_delayed_work_sync(&ah->tx_complete_work); cancel_delayed_work_sync(&ah->tx_complete_work);
ath5k_rfkill_hw_stop(ah); ath5k_rfkill_hw_stop(ah);
return ret;
} }
/* /*

14
drivers/net/wireless/ath/ath5k/mac80211-ops.c
View File

@ -65,20 +65,6 @@ ath5k_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
} }
static int
ath5k_start(struct ieee80211_hw *hw)
{
return ath5k_init_hw(hw->priv);
}
static void
ath5k_stop(struct ieee80211_hw *hw)
{
ath5k_stop_hw(hw->priv);
}
static int static int
ath5k_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif) ath5k_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
{ {