staging: rtl8723au: Make direct calls for HW_VAR_H2C_P2P_PS_OFFLOAD

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

diff --git a/drivers/staging/rtl8723au/core/rtw_p2p.c b/drivers/staging/rtl8723au/core/rtw_p2p.c
index 81eebe5b74d9166c4f1b70b520b16313cc8d5b1e..e5d9991040bb9686dd49e54ce7f4b04b55030228 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_p2p.c
+++ b/drivers/staging/rtl8723au/core/rtw_p2p.c
@@ -3567,7 +3567,7 @@ void p2p_ps_wk_hdl23a(struct rtw_adapter *padapter, u8 p2p_ps_state)
                case P2P_PS_DISABLE:
                        pwdinfo->p2p_ps_state = p2p_ps_state;
 
-                       rtw_hal_set_hwreg23a(padapter, HW_VAR_H2C_FW_P2P_PS_OFFLOAD, (u8 *)(&p2p_ps_state));
+                       rtl8723a_set_p2p_ps_offload_cmd(padapter, p2p_ps_state);
 
                        pwdinfo->noa_index = 0;
                        pwdinfo->ctwindow = 0;
@@ -3592,7 +3592,8 @@ void p2p_ps_wk_hdl23a(struct rtw_adapter *padapter, u8 p2p_ps_state)
                                                rtl8723a_set_FwPwrMode_cmd(padapter, padapter->pwrctrlpriv.pwr_mode);
                                        }
                                }
-                               rtw_hal_set_hwreg23a(padapter, HW_VAR_H2C_FW_P2P_PS_OFFLOAD, (u8 *)(&p2p_ps_state));
+                               rtl8723a_set_p2p_ps_offload_cmd(padapter,
+                                                               p2p_ps_state);
                        }
                        break;
                case P2P_PS_SCAN:
@@ -3600,7 +3601,8 @@ void p2p_ps_wk_hdl23a(struct rtw_adapter *padapter, u8 p2p_ps_state)
                case P2P_PS_ALLSTASLEEP:
                        if (pwdinfo->p2p_ps_mode > P2P_PS_NONE) {
                                pwdinfo->p2p_ps_state = p2p_ps_state;
-                               rtw_hal_set_hwreg23a(padapter, HW_VAR_H2C_FW_P2P_PS_OFFLOAD, (u8 *)(&p2p_ps_state));
+                               rtl8723a_set_p2p_ps_offload_cmd(padapter,
+                                                               p2p_ps_state);
                        }
                        break;
                default:

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
index 2e0350952d0ad11fe5f88996bd2d82fed13e36e2..f8d4ef3e7b0bdda75da9b6cc28d660ed79a9a836 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
@@ -3153,12 +3153,6 @@ void SetHwReg8723A(struct rtw_adapter *padapter, u8 variable, u8 *val)
                rtl8723a_odm_support_ability_clr(padapter, *val32);
                break;
 
-#ifdef CONFIG_8723AU_P2P
-       case HW_VAR_H2C_FW_P2P_PS_OFFLOAD:
-               rtl8723a_set_p2p_ps_offload_cmd(padapter, *val);
-               break;
-#endif /* CONFIG_8723AU_P2P */
-
        case HW_VAR_EFUSE_BYTES:
                pHalData->EfuseUsedBytes = *((u16 *) val);
                break;

diff --git a/drivers/staging/rtl8723au/include/hal_intf.h b/drivers/staging/rtl8723au/include/hal_intf.h
index 27b0eb8bb8669e7488201408f4cee774c6171ab7..f1cab544a44c5ca7af5f0b90d34fda0602a1c171 100644 (file)
--- a/drivers/staging/rtl8723au/include/hal_intf.h
+++ b/drivers/staging/rtl8723au/include/hal_intf.h
@@ -46,7 +46,6 @@ enum HW_VARIABLES {
        HW_VAR_CAM_READ,
        HW_VAR_SET_RPWM,
        HW_VAR_FWLPS_RF_ON,
-       HW_VAR_H2C_FW_P2P_PS_OFFLOAD,
        HW_VAR_TDLS_WRCR,
        HW_VAR_TDLS_INIT_CH_SEN,
        HW_VAR_TDLS_RS_RCR,