ath9k_hw: shift code for AR9280 OLC temp comp

We're bailing out on the alternative code path so remove the
else branch.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath/ath9k/calib.c b/drivers/net/wireless/ath/ath9k/calib.c
index e2c427b9ec628292a41bed6bbea5d27d781833fa..5d61169de07bfb3f704254aa2ebfb46c65abc7cc 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/calib.c
+++ b/drivers/net/wireless/ath/ath9k/calib.c
@@ -711,25 +711,24 @@ static void ath9k_olc_temp_compensation(struct ath_hw *ah)
                rddata = REG_READ(ah, AR_PHY_TX_PWRCTRL4);
                currPDADC = MS(rddata, AR_PHY_TX_PWRCTRL_PD_AVG_OUT);
 
-               if (ah->initPDADC == 0 || currPDADC == 0) {
+               if (ah->initPDADC == 0 || currPDADC == 0)
                        return;
-               } else {
-                       if (ah->eep_ops->get_eeprom(ah, EEP_DAC_HPWR_5G))
-                               delta = (currPDADC - ah->initPDADC + 4) / 8;
-                       else
-                               delta = (currPDADC - ah->initPDADC + 5) / 10;
-
-                       if (delta != ah->PDADCdelta) {
-                               ah->PDADCdelta = delta;
-                               for (i = 1; i < AR9280_TX_GAIN_TABLE_SIZE; i++) {
-                                       regval = ah->originalGain[i] - delta;
-                                       if (regval < 0)
-                                               regval = 0;
-
-                                       REG_RMW_FIELD(ah,
-                                                     AR_PHY_TX_GAIN_TBL1 + i * 4,
-                                                     AR_PHY_TX_GAIN, regval);
-                               }
+
+               if (ah->eep_ops->get_eeprom(ah, EEP_DAC_HPWR_5G))
+                       delta = (currPDADC - ah->initPDADC + 4) / 8;
+               else
+                       delta = (currPDADC - ah->initPDADC + 5) / 10;
+
+               if (delta != ah->PDADCdelta) {
+                       ah->PDADCdelta = delta;
+                       for (i = 1; i < AR9280_TX_GAIN_TABLE_SIZE; i++) {
+                               regval = ah->originalGain[i] - delta;
+                               if (regval < 0)
+                                       regval = 0;
+
+                               REG_RMW_FIELD(ah,
+                                             AR_PHY_TX_GAIN_TBL1 + i * 4,
+                                             AR_PHY_TX_GAIN, regval);
                        }
                }
        }