From: Oleksij Rempel <linux@rempel-privat.de>
Date: Sat, 11 May 2013 07:47:42 +0000 (+0200)
Subject: use ah_detach directly
X-Git-Tag: 1.4.0~12^2^2~67
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=5137137f342909a8b32d26669e2c6f70c6238631;p=open-ath9k-htc-firmware.git

use ah_detach directly

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

diff --git a/target_firmware/wlan/ah_osdep.c b/target_firmware/wlan/ah_osdep.c
index 4eb6727..eebf722 100755
--- a/target_firmware/wlan/ah_osdep.c
+++ b/target_firmware/wlan/ah_osdep.c
@@ -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;
 
 /*
diff --git a/target_firmware/wlan/ah_osdep.h b/target_firmware/wlan/ah_osdep.h
index f45e0cb..a4a3c6d 100755
--- a/target_firmware/wlan/ah_osdep.h
+++ b/target_firmware/wlan/ah_osdep.h
@@ -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_ */
diff --git a/target_firmware/wlan/if_ath.c b/target_firmware/wlan/if_ath.c
index 889d1b4..4cfc8c8 100755
--- a/target_firmware/wlan/if_ath.c
+++ b/target_firmware/wlan/if_ath.c
@@ -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)