ath5k: minor rfkill cleanup

Always enable rfkill since the ifdefs in the code is not really worth
the Kconfig option.  Also fix a few code style things, and remove the
usage of the ah_gpio[] array so we can remove it later.

Signed-off-by: Bob Copeland <me@bobcopeland.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/net/wireless/ath/ath5k/rfkill.c b/drivers/net/wireless/ath/ath5k/rfkill.c
index 492ada92db56..41a877b73fce 100644
--- a/drivers/net/wireless/ath/ath5k/rfkill.c
+++ b/drivers/net/wireless/ath/ath5k/rfkill.c
@@ -56,10 +56,12 @@ static inline void ath5k_rfkill_enable(struct ath5k_softc *sc)
 static inline void ath5k_rfkill_set_intr(struct ath5k_softc *sc, bool enable)
 {
         struct ath5k_hw *ah = sc->ah;
+        u32 curval;
+
         ath5k_hw_set_gpio_input(ah, sc->rf_kill.gpio);
-        ah->ah_gpio[0] = ath5k_hw_get_gpio(ah, sc->rf_kill.gpio);
+        curval = ath5k_hw_get_gpio(ah, sc->rf_kill.gpio);
         ath5k_hw_set_gpio_intr(ah, sc->rf_kill.gpio, enable ?
-                                        !!ah->ah_gpio[0] : !ah->ah_gpio[0]);
+                                        !!curval : !curval);
 }
 
 static bool
@@ -97,9 +99,8 @@ ath5k_rfkill_hw_start(struct ath5k_hw *ah)
         ath5k_rfkill_disable(sc);
 
         /* enable interrupt for rfkill switch */
-        if (AR5K_EEPROM_HDR_RFKILL(ah->ah_capabilities.cap_eeprom.ee_header)) {
+        if (AR5K_EEPROM_HDR_RFKILL(ah->ah_capabilities.cap_eeprom.ee_header))
                 ath5k_rfkill_set_intr(sc, true);
-        }
 }
 
 
@@ -109,9 +110,8 @@ ath5k_rfkill_hw_stop(struct ath5k_hw *ah)
         struct ath5k_softc *sc = ah->ah_sc;
 
         /* disable interrupt for rfkill switch */
-        if (AR5K_EEPROM_HDR_RFKILL(ah->ah_capabilities.cap_eeprom.ee_header)) {
+        if (AR5K_EEPROM_HDR_RFKILL(ah->ah_capabilities.cap_eeprom.ee_header))
                 ath5k_rfkill_set_intr(sc, false);
-        }
 
         tasklet_kill(&sc->rf_kill.toggleq);