use ah_detach directly
authorOleksij Rempel <linux@rempel-privat.de>
Sat, 11 May 2013 07:47:42 +0000 (09:47 +0200)
committerOleksij Rempel <linux@rempel-privat.de>
Sat, 11 May 2013 14:10:03 +0000 (16:10 +0200)
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
target_firmware/wlan/ah_osdep.c
target_firmware/wlan/ah_osdep.h
target_firmware/wlan/if_ath.c

index 4eb6727e86c59d23764d47ad4cc3c8a4a33cb01f..eebf7225377e94ad1f21eaa1988bba48a3e1262c 100755 (executable)
@@ -70,12 +70,6 @@ _ath_hal_attach_tgt(a_uint32_t devid, HAL_SOFTC sc,
        return ah;
 }
 
-void
-ath_hal_detach(struct ath_hal *ah)
-{
-       (*ah->ah_detach)(ah);
-}
-
 extern void *global_hdl;
 
 /*
index f45e0cbd3a7f5ec8d751f61827ea124b469211d4..a4a3c6d602838e758e608d09429f581a166441cc 100755 (executable)
@@ -158,5 +158,4 @@ extern  a_uint32_t __ahdecl ath_hal_reg_read_target(struct ath_hal *ah, a_uint32
 #define AH_USE_EEPROM     0x00000001
 extern  struct ath_hal *_ath_hal_attach_tgt( a_uint32_t, HAL_SOFTC, adf_os_device_t,
        a_uint32_t flags, void* status);
-extern  void ath_hal_detach(struct ath_hal *);
 #endif /* _ATH_AH_OSDEP_H_ */
index 889d1b4f29f5302a873821f2bb106a7d6386915f..4cfc8c85858ea3437feb78621c2d127175016d88 100755 (executable)
@@ -1644,7 +1644,7 @@ static void ath_detach_tgt(void *Context, A_UINT16 Command, A_UINT16 SeqNo,
        struct ath_hal *ah = sc->sc_ah;
 
        ath_desc_free(sc);
-       ath_hal_detach(ah);
+       ah->ah_detach(ah);
        wmi_cmd_rsp(sc->tgt_wmi_handle, Command, SeqNo, NULL, 0);
        adf_os_mem_free(sc);
 }
@@ -1936,7 +1936,7 @@ bad:
 bad2:
        ath_desc_free(sc);
        if (ah)
-               ath_hal_detach(ah);
+               ah->ah_detach(ah);
 }
 
 static void tgt_hif_htc_wmi_shutdown(struct ath_softc_tgt *sc)