ath9k_hw: remove ah->config.ht_enable

It is only used in one place, and the device id check that it's based on
can be moved there as well.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index de0d218195da57046216905f3583118ac2ab0a19..625ad0bcdc1fce00cd98c1d627691d4f18b4493f 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -378,11 +378,6 @@ static void ath9k_hw_init_config(struct ath_hw *ah)
                ah->config.spurchans[i][1] = AR_NO_SPUR;
        }
 
-       if (ah->hw_version.devid != AR2427_DEVID_PCIE)
-               ah->config.ht_enable = 1;
-       else
-               ah->config.ht_enable = 0;
-
        /* PAPRD needs some more work to be enabled */
        ah->config.paprd_disable = 1;
 
@@ -1880,7 +1875,7 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)
 
        common->crypt_caps |= ATH_CRYPT_CAP_CIPHER_AESCCM;
 
-       if (ah->config.ht_enable)
+       if (ah->hw_version.devid != AR2427_DEVID_PCIE)
                pCap->hw_caps |= ATH9K_HW_CAP_HT;
        else
                pCap->hw_caps &= ~ATH9K_HW_CAP_HT;

diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index 4e62ad858d8acdae59c2374be4036a6779e83929..7bbf7015af13bb02dc1bf7444d8f37d958dae24e 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -222,7 +222,6 @@ struct ath9k_ops_config {
        u8 pcie_clock_req;
        u32 pcie_waen;
        u8 analog_shiftreg;
-       u8 ht_enable;
        u8 paprd_disable;
        u32 ofdm_trig_low;
        u32 ofdm_trig_high;