Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / ath / ath5k / phy.c

diff --git a/drivers/net/wireless/ath/ath5k/phy.c b/drivers/net/wireless/ath/ath5k/phy.c
index a78afa98c6509559f6cec5348d3c93648d520702..d6bc7cb61bfb9b31ffa478fc77aae84ef1c39905 100644 (file)
--- a/drivers/net/wireless/ath/ath5k/phy.c
+++ b/drivers/net/wireless/ath/ath5k/phy.c
@@ -1612,11 +1612,7 @@ ath5k_hw_update_noise_floor(struct ath5k_hw *ah)
 
        ah->ah_cal_mask |= AR5K_CALIBRATION_NF;
 
-       ee_mode = ath5k_eeprom_mode_from_channel(ah->ah_current_channel);
-       if (WARN_ON(ee_mode < 0)) {
-               ah->ah_cal_mask &= ~AR5K_CALIBRATION_NF;
-               return;
-       }
+       ee_mode = ath5k_eeprom_mode_from_channel(ah, ah->ah_current_channel);
 
        /* completed NF calibration, test threshold */
        nf = ath5k_hw_read_measured_noise_floor(ah);
@@ -2317,12 +2313,7 @@ ath5k_hw_set_antenna_mode(struct ath5k_hw *ah, u8 ant_mode)
 
        def_ant = ah->ah_def_ant;
 
-       ee_mode = ath5k_eeprom_mode_from_channel(channel);
-       if (ee_mode < 0) {
-               ATH5K_ERR(ah,
-                       "invalid channel: %d\n", channel->center_freq);
-               return;
-       }
+       ee_mode = ath5k_eeprom_mode_from_channel(ah, channel);
 
        switch (ant_mode) {
        case AR5K_ANTMODE_DEFAULT:
@@ -3622,12 +3613,7 @@ ath5k_hw_txpower(struct ath5k_hw *ah, struct ieee80211_channel *channel,
                return -EINVAL;
        }
 
-       ee_mode = ath5k_eeprom_mode_from_channel(channel);
-       if (ee_mode < 0) {
-               ATH5K_ERR(ah,
-                       "invalid channel: %d\n", channel->center_freq);
-               return -EINVAL;
-       }
+       ee_mode = ath5k_eeprom_mode_from_channel(ah, channel);
 
        /* Initialize TX power table */
        switch (ah->ah_radio) {