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

Commit fabba048 authored by Pavel Roskin's avatar Pavel Roskin Committed by John W. Linville
Browse files

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



Signed-off-by: default avatarPavel Roskin <proski@gnu.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 24aad3f4

drivers/net/wireless/ath/ath5k/ath5k.h

+2 −2
Original line number Diff line number Diff line
@@ -1372,8 +1372,8 @@ void ath5k_set_beacon_filter(struct ieee80211_hw *hw, bool enable); 
bool ath5k_any_vif_assoc(struct ath5k_hw *ah);

void ath5k_tx_queue(struct ieee80211_hw *hw, struct sk_buff *skb,

		    struct ath5k_txq *txq);

int ath5k_init_hw(struct ath5k_hw *ah);

int ath5k_stop_hw(struct ath5k_hw *ah);

int ath5k_start(struct ieee80211_hw *hw);

void ath5k_stop(struct ieee80211_hw *hw);

void ath5k_mode_setup(struct ath5k_hw *ah, struct ieee80211_vif *vif);

void ath5k_update_bssid_mask_and_opmode(struct ath5k_hw *ah,

					struct ieee80211_vif *vif);

drivers/net/wireless/ath/ath5k/base.c

+4 −6
Original line number Diff line number Diff line
@@ -2526,9 +2526,9 @@ ath5k_stop_locked(struct ath5k_hw *ah) 
	return 0;

}



int

ath5k_init_hw(struct ath5k_hw *ah)

int ath5k_start(struct ieee80211_hw *hw)

{

	struct ath5k_hw *ah = hw->priv;

	struct ath_common *common = ath5k_hw_common(ah);

	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

 * stop is preempted).

 */

int

ath5k_stop_hw(struct ath5k_hw *ah)

void ath5k_stop(struct ieee80211_hw *hw)

{

	struct ath5k_hw *ah = hw->priv;

	int ret;



	mutex_lock(&ah->lock);
@@ -2644,8 +2644,6 @@ ath5k_stop_hw(struct ath5k_hw *ah) 
	cancel_delayed_work_sync(&ah->tx_complete_work);



	ath5k_rfkill_hw_stop(ah);



	return ret;

}



/*

drivers/net/wireless/ath/ath5k/mac80211-ops.c

+0 −14
Original line number Diff line number Diff line
@@ -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

ath5k_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)

{