remove unused variables in ath_hal_getcapability

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>

diff --git a/target_firmware/wlan/ah.c b/target_firmware/wlan/ah.c
index 71deb5ec646eda573320ef1ab78623a2141d279c..ea79d12b835685b47ffe9618bda9b153d80eb81c 100755 (executable)
--- a/target_firmware/wlan/ah.c
+++ b/target_firmware/wlan/ah.c
@@ -54,9 +54,7 @@ ath_hal_attach_tgt(a_uint32_t devid,HAL_SOFTC sc,
 }
 
 HAL_STATUS
-ath_hal_getcapability(struct ath_hal *ah, HAL_CAPABILITY_TYPE type,
-                     a_uint32_t capability, a_uint32_t *result)
-
+ath_hal_getcapability(struct ath_hal *ah, HAL_CAPABILITY_TYPE type)
 {
        const HAL_CAPABILITIES *pCap = &AH_PRIVATE(ah)->ah_caps;
        switch (type) {
@@ -113,7 +111,7 @@ ath_hal_computetxtime(struct ath_hal *ah,
                numBits = frameLen << 3;
                txTime = phyTime + ((numBits * 1000)/kbps);
                /* TODO: make sure the same value of txTime can use in all device */
-               if (ath_hal_getcapability(ah, HAL_CAP_HT, 0, AH_NULL) != HAL_OK)
+               if (ath_hal_getcapability(ah, HAL_CAP_HT) != HAL_OK)
                        txTime = txTime + CCK_SIFS_TIME;
                break;
        case IEEE80211_T_OFDM:
@@ -125,7 +123,7 @@ ath_hal_computetxtime(struct ath_hal *ah,
                numSymbols = asf_howmany(numBits, bitsPerSymbol);
                txTime = OFDM_PREAMBLE_TIME + (numSymbols * OFDM_SYMBOL_TIME);
                /* TODO: make sure the same value of txTime can use in all device */
-               if (ath_hal_getcapability(ah, HAL_CAP_HT, 0, AH_NULL) != HAL_OK)
+               if (ath_hal_getcapability(ah, HAL_CAP_HT) != HAL_OK)
                        txTime = txTime + OFDM_SIFS_TIME;
                break;
        default:
@@ -180,7 +178,7 @@ ath_hal_wait(struct ath_hal *ah, a_uint32_t reg, a_uint32_t mask, a_uint32_t val
 
        a_int32_t i;
 
-       if (ath_hal_getcapability(ah, HAL_CAP_HT, 0, AH_NULL) == HAL_OK) {
+       if (ath_hal_getcapability(ah, HAL_CAP_HT) == HAL_OK) {
                for (i = 0; i < AH_TIMEOUT_11N; i++) {
                        if ((OS_REG_READ(ah, reg) & mask) == val)
                                return AH_TRUE;

diff --git a/target_firmware/wlan/ah_internal.h b/target_firmware/wlan/ah_internal.h
index 64a54a0954aecf33bf29f1a42d4df51359057a29..a43652ecd7ba70e9ae93f2ba3ea8360c1d622ac4 100755 (executable)
--- a/target_firmware/wlan/ah_internal.h
+++ b/target_firmware/wlan/ah_internal.h
@@ -260,8 +260,7 @@ extern void ath_hal_free(void *);
  * this routine to support chip-specific capabilities.
  */
 extern HAL_STATUS ath_hal_getcapability(struct ath_hal *ah,
-               HAL_CAPABILITY_TYPE type, a_uint32_t capability,
-               a_uint32_t *result);
+               HAL_CAPABILITY_TYPE type);
 extern HAL_BOOL ath_hal_setcapability(struct ath_hal *ah,
              HAL_CAPABILITY_TYPE type, a_uint32_t capability,
              a_uint32_t setting, HAL_STATUS *status);

diff --git a/target_firmware/wlan/if_ath.c b/target_firmware/wlan/if_ath.c
index 53b15cd1f34760ea9c2b36a9a81b2b7c1d75cb96..aa43c23238ddd417ae894bc686adceaaff631e01 100755 (executable)
--- a/target_firmware/wlan/if_ath.c
+++ b/target_firmware/wlan/if_ath.c
@@ -1132,7 +1132,7 @@ static void ath_init_tgt(void *Context, A_UINT16 Command,
 
        sc->sc_imask |= HAL_INT_GTT;
 
-       if (ath_hal_htsupported(ah))
+       if (ath_hal_getcapability(ah, HAL_CAP_HT))
                sc->sc_imask |= HAL_INT_CST;
 
        adf_os_setup_intr(sc->sc_dev, ath_intr);

diff --git a/target_firmware/wlan/if_athvar.h b/target_firmware/wlan/if_athvar.h
index f6f67cb838ec2919b4ad4fdac2bb4e3f01e0b790..2c42ee3f5158f60121e1345745b719f52f111bce 100755 (executable)
--- a/target_firmware/wlan/if_athvar.h
+++ b/target_firmware/wlan/if_athvar.h
@@ -489,9 +489,4 @@ typedef enum {
 
 a_uint8_t ath_get_minrateidx(struct ath_softc_tgt *sc, struct ath_vap_target *avp);
 
-#define ath_hal_htsupported(_ah) \
-    (ath_hal_getcapability(_ah, HAL_CAP_HT, 0, NULL) == HAL_OK)
-#define ath_hal_getrtsaggrlimit(_ah, _pv) \
-    (ath_hal_getcapability(_ah, HAL_CAP_RTS_AGGR_LIMIT, 0, _pv) == HAL_OK)
-
 #endif /* _DEV_ATH_ATHVAR_H */

diff --git a/target_firmware/wlan/if_owl.c b/target_firmware/wlan/if_owl.c
index 19a945cdfcfe49b707e8255b99ff41c40e596df4..b7df875d57f321fc439db48956b8b0415ccce591 100755 (executable)
--- a/target_firmware/wlan/if_owl.c
+++ b/target_firmware/wlan/if_owl.c
@@ -387,7 +387,7 @@ static void ath_buf_set_rate(struct ath_softc_tgt *sc, struct ath_tx_buf *bf)
            cix = rt->info[sc->sc_protrix].controlRate;
            prot_mode = AH_TRUE;
     } else {
-           if (ath_hal_htsupported(ah) && (!bf->bf_ismcast))
+           if (ath_hal_getcapability(ah, HAL_CAP_HT) && (!bf->bf_ismcast))
                    flags = HAL_TXDESC_RTSENA;
 
            for (i = 4; i--;) {