staging: rtl8723au: Make direct calls for HW_VAR_NAV_UPPER

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
index f8d4ef3..8d7f124 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
@@ -3163,9 +3163,6 @@ void SetHwReg8723A(struct rtw_adapter *padapter, u8 variable, u8 *val)
                rtl8723a_set_apfm_on_mac(padapter, *val);
                break;
 
-       case HW_VAR_NAV_UPPER:
-               rtl8723a_set_nav_upper(padapter, *val32);
-               break;
        default:
                break;
        }

diff --git a/drivers/staging/rtl8723au/hal/usb_halinit.c b/drivers/staging/rtl8723au/hal/usb_halinit.c
index 0bbc56a..aaa81f8 100644 (file)
--- a/drivers/staging/rtl8723au/hal/usb_halinit.c
+++ b/drivers/staging/rtl8723au/hal/usb_halinit.c
@@ -621,7 +621,6 @@ static u32 rtl8723au_hal_init(struct rtw_adapter *Adapter)
        struct hal_data_8723a *pHalData = GET_HAL_DATA(Adapter);
        struct pwrctrl_priv *pwrctrlpriv = &Adapter->pwrctrlpriv;
        struct registry_priv *pregistrypriv = &Adapter->registrypriv;
-       u32 NavUpper = WiFiNavUpperUs;
 
        unsigned long init_start_time = jiffies;
 
@@ -888,7 +887,7 @@ static u32 rtl8723au_hal_init(struct rtw_adapter *Adapter)
        rtl8723a_InitHalDm(Adapter);
 
        HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_MISC31);
-       rtw_hal_set_hwreg23a(Adapter, HW_VAR_NAV_UPPER, (u8 *)&NavUpper);
+       rtl8723a_set_nav_upper(Adapter, WiFiNavUpperUs);
 
        /*  2011/03/09 MH debug only, UMC-B cut pass 2500 S5 test, but we need to fin root cause. */
        if (((rtw_read32(Adapter, rFPGA0_RFMOD) & 0xFF000000) != 0x83000000)) {

diff --git a/drivers/staging/rtl8723au/include/hal_intf.h b/drivers/staging/rtl8723au/include/hal_intf.h
index 2d5ace5..9c94b13 100644 (file)
--- a/drivers/staging/rtl8723au/include/hal_intf.h
+++ b/drivers/staging/rtl8723au/include/hal_intf.h
@@ -61,7 +61,6 @@ enum HW_VARIABLES {
        HW_VAR_APFM_ON_MAC, /* Auto FSM to Turn On, include clock, isolation, power control for MAC only */
        /*  The valid upper nav range for the HW updating, if the true value is larger than the upper range, the HW won't update it. */
        /*  Unit in microsecond. 0 means disable this function. */
-       HW_VAR_NAV_UPPER,
        HW_VAR_RPT_TIMER_SETTING,
        HW_VAR_TX_RPT_MAX_MACID,
        HW_VAR_H2C_MEDIA_STATUS_RPT,