From 2c9d0b027ee2170505ab4f148fcb764442c0f640 Mon Sep 17 00:00:00 2001 From: Oleksij Rempel Date: Sun, 31 Mar 2013 15:28:55 +0200 Subject: [PATCH] build fix: remove unused variable HAL_BUS_HANDLE sh serie of function pass this vairiable but do not use it on actual target. Signed-off-by: Oleksij Rempel --- target_firmware/wlan/ah.c | 6 +++--- target_firmware/wlan/ah.h | 3 +-- target_firmware/wlan/ah_osdep.c | 4 ++-- target_firmware/wlan/ah_osdep.h | 2 +- target_firmware/wlan/ar5416_hw.c | 3 +-- target_firmware/wlan/if_ath.c | 2 +- 6 files changed, 9 insertions(+), 11 deletions(-) diff --git a/target_firmware/wlan/ah.c b/target_firmware/wlan/ah.c index 53993f5..ada5ab2 100755 --- a/target_firmware/wlan/ah.c +++ b/target_firmware/wlan/ah.c @@ -39,17 +39,17 @@ #include extern struct ath_hal *ar5416Attach(a_uint32_t devid,HAL_SOFTC sc, adf_os_device_t dev, - HAL_BUS_HANDLE sh, a_uint32_t flags, HAL_STATUS *status); + a_uint32_t flags, HAL_STATUS *status); struct ath_hal* ath_hal_attach_tgt(a_uint32_t devid,HAL_SOFTC sc, - adf_os_device_t dev, HAL_BUS_HANDLE sh, + adf_os_device_t dev, a_uint32_t flags, HAL_STATUS *error) { struct ath_hal *ah = AH_NULL; devid = AR5416_DEVID_PCIE; - ah = ar5416Attach(devid, sc, dev, sh, flags, error); + ah = ar5416Attach(devid, sc, dev, flags, error); return ah; } diff --git a/target_firmware/wlan/ah.h b/target_firmware/wlan/ah.h index 6425de6..714df75 100755 --- a/target_firmware/wlan/ah.h +++ b/target_firmware/wlan/ah.h @@ -367,7 +367,6 @@ struct ath_hal { a_uint32_t ah_magic; HAL_SOFTC ah_sc; - HAL_BUS_HANDLE ah_sh; adf_os_device_t ah_dev; a_uint32_t ah_macVersion; @@ -479,7 +478,7 @@ struct ath_hal extern struct ath_hal * __ahdecl ath_hal_attach_tgt(a_uint32_t devid, HAL_SOFTC, - adf_os_device_t dev, HAL_BUS_HANDLE sh, + adf_os_device_t dev, a_uint32_t flags, HAL_STATUS* status); extern const HAL_RATE_TABLE * __ahdecl ath_hal_getratetable(struct ath_hal *, diff --git a/target_firmware/wlan/ah_osdep.c b/target_firmware/wlan/ah_osdep.c index 7cb2266..dc1753b 100755 --- a/target_firmware/wlan/ah_osdep.c +++ b/target_firmware/wlan/ah_osdep.c @@ -62,10 +62,10 @@ ath_hal_getuptime(struct ath_hal *ah) struct ath_hal * _ath_hal_attach_tgt(a_uint32_t devid, HAL_SOFTC sc, - adf_os_device_t dev,HAL_BUS_HANDLE sh, a_uint32_t flags, void* s) + adf_os_device_t dev, a_uint32_t flags, void* s) { HAL_STATUS status; - struct ath_hal *ah = ath_hal_attach_tgt(devid,sc,dev,sh, flags, &status); + struct ath_hal *ah = ath_hal_attach_tgt(devid, sc, dev, flags, &status); adf_os_print(" ath_hal = %p \n",ah); *(HAL_STATUS *)s = status; return ah; diff --git a/target_firmware/wlan/ah_osdep.h b/target_firmware/wlan/ah_osdep.h index 58a07ec..f45e0cb 100755 --- a/target_firmware/wlan/ah_osdep.h +++ b/target_firmware/wlan/ah_osdep.h @@ -156,7 +156,7 @@ extern void __ahdecl ath_hal_reg_write_target(struct ath_hal *ah, extern a_uint32_t __ahdecl ath_hal_reg_read_target(struct ath_hal *ah, a_uint32_t reg); #define AH_USE_EEPROM 0x00000001 -extern struct ath_hal *_ath_hal_attach_tgt( a_uint32_t,HAL_SOFTC,adf_os_device_t,HAL_BUS_HANDLE, +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/ar5416_hw.c b/target_firmware/wlan/ar5416_hw.c index 7bc0b8b..c0ae418 100644 --- a/target_firmware/wlan/ar5416_hw.c +++ b/target_firmware/wlan/ar5416_hw.c @@ -99,7 +99,7 @@ void ar5416Detach(struct ath_hal *ah) struct ath_hal * ar5416Attach(a_uint32_t devid,HAL_SOFTC sc, adf_os_device_t dev, - HAL_BUS_HANDLE sh, a_uint32_t flags, HAL_STATUS *status) + a_uint32_t flags, HAL_STATUS *status) { struct ath_hal_5416 *ahp; struct ath_hal *ah; @@ -115,7 +115,6 @@ ar5416Attach(a_uint32_t devid,HAL_SOFTC sc, adf_os_device_t dev, ah->ah_dev = dev; ah->ah_sc = sc; - ah->ah_sh = sh; /* If its a Owl 2.0 chip then change the hal structure to point to the Owl 2.0 ar5416_hal_20 structure */ diff --git a/target_firmware/wlan/if_ath.c b/target_firmware/wlan/if_ath.c index abbdb3e..33fb7c9 100755 --- a/target_firmware/wlan/if_ath.c +++ b/target_firmware/wlan/if_ath.c @@ -1906,7 +1906,7 @@ a_int32_t ath_tgt_attach(a_uint32_t devid,a_uint32_t mem_start, ATH_INIT_TQUEUE(sc->sc_dev, &sc->sc_fataltq, ath_fatal_tasklet, sc); flags |= AH_USE_EEPROM; - ah = _ath_hal_attach_tgt(devid,sc,sc->sc_dev,mem_start, flags, &status); + ah = _ath_hal_attach_tgt(devid, sc, sc->sc_dev, flags, &status); if (ah == NULL) { error = ENXIO; goto bad; -- 2.31.1