diff options
| author | Pavel Roskin <proski@gnu.org> | 2011-07-21 13:36:28 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-07-22 09:51:14 -0400 |
| commit | fabba0480637add5411b1dc59603cc71e3505a69 (patch) | |
| tree | be0ef4e4f52ec53fd2ef7cedd2b0ff046bdfc99a /drivers/net/wireless/ath/ath5k/base.c | |
| parent | 24aad3f4c8a5c0a7514733fb9fa70994e24a5707 (diff) | |
ath5k: merge ath5k_{init, deinit}_hw() with their thin wrappers
Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath5k/base.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath5k/base.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c index 20e4ef4db3e..a74d2860145 100644 --- a/drivers/net/wireless/ath/ath5k/base.c +++ b/drivers/net/wireless/ath/ath5k/base.c @@ -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; } /* |