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

Commit 20fbed21 authored by Bruno Randolf's avatar Bruno Randolf Committed by John W. Linville
Browse files

ath5k: no need to save/restore the default antenna 



Since ath5k_hw_set_antenna_mode() always writes the default antenna register
and is called at the end of reset, there is no need to separately save and
restore the default antenna.

Signed-off-by: default avatarBruno Randolf <br1@einfach.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0ca74027

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

+1 −7
Original line number Diff line number Diff line
@@ -877,12 +877,11 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode, 
	struct ieee80211_channel *channel, bool change_channel)

{

	struct ath_common *common = ath5k_hw_common(ah);

	u32 s_seq[10], s_ant, s_led[3], staid1_flags, tsf_up, tsf_lo;

	u32 s_seq[10], s_led[3], staid1_flags, tsf_up, tsf_lo;

	u32 phy_tst1;

	u8 mode, freq, ee_mode;

	int i, ret;



	s_ant = 0;

	ee_mode = 0;

	staid1_flags = 0;

	tsf_up = 0;
@@ -979,9 +978,6 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode, 
			}

		}



		/* Save default antenna */

		s_ant = ath5k_hw_reg_read(ah, AR5K_DEFAULT_ANTENNA);



		if (ah->ah_version == AR5K_AR5212) {

			/* Restore normal 32/40MHz clock operation

			 * to avoid register access delay on certain
@@ -1141,8 +1137,6 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode, 
				ath5k_hw_reg_write(ah, tsf_lo, AR5K_TSF_L32);

			}

		}



		ath5k_hw_reg_write(ah, s_ant, AR5K_DEFAULT_ANTENNA);

	}



	/* Ledstate */