use ah_setInterrupts directly

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

diff --git a/target_firmware/wlan/if_ath.c b/target_firmware/wlan/if_ath.c
index 3907262818fb15ec9aadcd2dda59838ef848d57f..9d0f8d48e2662c794a0813cea63dfda9f8fc6b4b 100755 (executable)
--- a/target_firmware/wlan/if_ath.c
+++ b/target_firmware/wlan/if_ath.c
@@ -522,7 +522,7 @@ static void ath_tgt_rx_tasklet(TQUEUE_ARG data)
        } while(1);
 
        sc->sc_imask |= HAL_INT_RX;
-       ath_hal_intrset(ah, sc->sc_imask);
+       ah->ah_setInterrupts(ah, sc->sc_imask);
 }
 
 /*******************/
@@ -1029,7 +1029,7 @@ adf_os_irq_resp_t ath_intr(adf_drv_handle_t hdl)
        status &= sc->sc_imask;
 
        if (status & HAL_INT_FATAL) {
-               ath_hal_intrset(ah, 0);
+               ah->ah_setInterrupts(ah, 0);
                ATH_SCHEDULE_TQUEUE(sc->sc_dev, &sc->sc_fataltq);
        } else {
                if (status & HAL_INT_SWBA) {
@@ -1061,7 +1061,7 @@ adf_os_irq_resp_t ath_intr(adf_drv_handle_t hdl)
                        ath_uapsd_processtriggers(sc);
 
                        sc->sc_imask &= ~HAL_INT_RX;
-                       ath_hal_intrset(ah, sc->sc_imask);
+                       ah->ah_setInterrupts(ah, sc->sc_imask);
 
                        ATH_SCHEDULE_TQUEUE(sc->sc_dev, &sc->sc_rxtq);
                }
@@ -1127,7 +1127,7 @@ static void ath_enable_intr_tgt(void *Context, A_UINT16 Command,
                sc->sc_imask |= HAL_INT_BMISS;
        }
 
-       ath_hal_intrset(ah, sc->sc_imask);
+       ah->ah_setInterrupts(ah, sc->sc_imask);
        wmi_cmd_rsp(sc->tgt_wmi_handle, Command, SeqNo,NULL, 0);
 }
 
@@ -1147,7 +1147,7 @@ static void ath_init_tgt(void *Context, A_UINT16 Command,
                sc->sc_imask |= HAL_INT_CST;
 
        adf_os_setup_intr(sc->sc_dev, ath_intr);
-       ath_hal_intrset(ah, sc->sc_imask);
+       ah->ah_setInterrupts(ah, sc->sc_imask);
 
        wmi_cmd_rsp(sc->tgt_wmi_handle, Command, SeqNo, NULL, 0);
 }
@@ -1516,7 +1516,7 @@ static void ath_disable_intr_tgt(void *Context, A_UINT16 Command,
        struct ath_softc_tgt *sc = (struct ath_softc_tgt *)Context;
        struct ath_hal *ah = sc->sc_ah;
 
-       ath_hal_intrset(ah, 0);
+       ah->ah_setInterrupts(ah, 0);
        wmi_cmd_rsp(sc->tgt_wmi_handle, Command, SeqNo,NULL, 0);
 }
 
@@ -1931,7 +1931,7 @@ a_int32_t ath_tgt_attach(a_uint32_t devid, struct ath_softc_tgt *sc, adf_os_devi
 
        ath_tgt_txq_setup(sc);
        sc->sc_imask =0;
-       ath_hal_intrset(ah,0);
+       ah->ah_setInterrupts(ah, 0);
 
        return 0;
 bad:

diff --git a/target_firmware/wlan/if_athvar.h b/target_firmware/wlan/if_athvar.h
index a519513e1b010d99b1df7e1ec003aded8152fbb3..d553189f5de2e59ca83833b4b561398a65583567 100755 (executable)
--- a/target_firmware/wlan/if_athvar.h
+++ b/target_firmware/wlan/if_athvar.h
@@ -489,8 +489,6 @@ typedef enum {
 
 a_uint8_t ath_get_minrateidx(struct ath_softc_tgt *sc, struct ath_vap_target *avp);
 
-#define ath_hal_intrset(_ah, _mask) \
-    ((*(_ah)->ah_setInterrupts)((_ah), (_mask)))
 #define ath_hal_setuprxdesc(_ah, _ds, _size, _intreq) \
     ((*(_ah)->ah_setupRxDesc)((_ah), (_ds), (_size), (_intreq)))
 #define ath_hal_rxprocdescfast(_ah, _ds, _dspa, _dsnext, _rx_stats) \
@@ -527,8 +525,6 @@ a_uint8_t ath_get_minrateidx(struct ath_softc_tgt *sc, struct ath_vap_target *av
     (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)
-#define ath_hal_intrset(_ah, _mask) \
-    ((*(_ah)->ah_setInterrupts)((_ah), (_mask)))
 #define ath_hal_set11n_aggr_first(_ah, _ds, _aggrlen, _numdelims) \
     ((*(_ah)->ah_set11nAggrFirst)(_ah, _ds, _aggrlen, _numdelims))
 #define ath_hal_set11n_aggr_middle(_ah, _ds, _numdelims) \

diff --git a/target_firmware/wlan/if_owl.c b/target_firmware/wlan/if_owl.c
index 3d4744d263c4e3cc1bcd5b1bbbd8280e5dc8d527..f5ce647f453207eee1a8dc08f717f49f4bc9c517 100755 (executable)
--- a/target_firmware/wlan/if_owl.c
+++ b/target_firmware/wlan/if_owl.c
@@ -616,9 +616,10 @@ void ath_tx_status_send(struct ath_softc_tgt *sc)
 
 static void owltgt_tx_process_cabq(struct ath_softc_tgt *sc, struct ath_txq *txq)
 {
-       ath_hal_intrset(sc->sc_ah, sc->sc_imask & ~HAL_INT_SWBA);
+       struct ath_hal *ah = sc->sc_ah;
+       ah->ah_setInterrupts(ah, sc->sc_imask & ~HAL_INT_SWBA);
        owltgt_tx_processq(sc, txq, OWL_TXQ_ACTIVE);
-       ath_hal_intrset(sc->sc_ah, sc->sc_imask);
+       ah->ah_setInterrupts(ah, sc->sc_imask);
 }
 
 void owl_tgt_tx_tasklet(TQUEUE_ARG data)