staging: r8188eu: remove HW_VAR_RPT_TIMER_SETTING from SetHwReg8188EU()

Remove the HW_VAR_RPT_TIMER_SETTING case from SetHwReg8188EU() and
move its functionality to rtw_cmd.c where it is actually used. This is
part of the ongoing effort to get rid of the unwanted hal layer.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220402092332.6627-6-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/core/rtw_cmd.c b/drivers/staging/r8188eu/core/rtw_cmd.c
index 60d4737..9b89bd7 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_cmd.c
+++ b/drivers/staging/r8188eu/core/rtw_cmd.c
@@ -1045,7 +1045,10 @@ exit:
 
 static void rpt_timer_setting_wk_hdl(struct adapter *padapter, u16 min_time)
 {
-       SetHwReg8188EU(padapter, HW_VAR_RPT_TIMER_SETTING, (u8 *)(&min_time));
+       struct hal_data_8188e *haldata = &padapter->haldata;
+       struct odm_dm_struct *odmpriv = &haldata->odmpriv;
+
+       ODM_RA_Set_TxRPT_Time(odmpriv, min_time);
 }
 
 u8 rtw_rpt_timer_cfg_cmd(struct adapter *padapter, u16 min_time)

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index 39db038..d13a8ab 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -1175,12 +1175,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)
                        }
                }
                break;
-       case HW_VAR_RPT_TIMER_SETTING:
-               {
-                       u16 min_rpt_time = (*(u16 *)val);
-                       ODM_RA_Set_TxRPT_Time(podmpriv, min_rpt_time);
-               }
-               break;
        case HW_VAR_FIFO_CLEARN_UP:
                {
                        struct pwrctrl_priv *pwrpriv = &Adapter->pwrctrlpriv;

diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h
index 1ba2eb0..edc4c6f 100644 (file)
--- a/drivers/staging/r8188eu/include/hal_intf.h
+++ b/drivers/staging/r8188eu/include/hal_intf.h
@@ -26,7 +26,6 @@ enum hw_variables {
        HW_VAR_H2C_FW_P2P_PS_OFFLOAD,
        HW_VAR_INITIAL_GAIN,
        HW_VAR_FIFO_CLEARN_UP,
-       HW_VAR_RPT_TIMER_SETTING,
        HW_VAR_H2C_MEDIA_STATUS_RPT,
 };