staging: r8188eu: remove HW_VAR_DM_FLAG from SetHwReg8188EU()

Remove the HW_VAR_DM_FLAG case from SetHwReg8188EU() and move its
functionality to a static function. This is part of the ongoing
effort to get rid of SetHwReg8188EU().

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

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index 0aae713d2c1c499930c901420d5c6d6786a0ca2f..ece57565b08270cb9ad5ff9fb818090c5e23d467 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -1157,9 +1157,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)
                        rtw_write32(Adapter, REG_RCR, reg32 | RCR_CBSSID_BCN);
                }
                break;
-       case HW_VAR_DM_FLAG:
-               podmpriv->SupportAbility = *((u8 *)val);
-               break;
        case HW_VAR_DM_FUNC_RESET:
                podmpriv->SupportAbility = pdmpriv->InitODMFlag;
                break;

diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h
index 261823e7e8e80ab45351bce2b0e9f09dd166ce46..89aeb6c2229f38bb9f25f3e614f7209ad8dac1cd 100644 (file)
--- a/drivers/staging/r8188eu/include/hal_intf.h
+++ b/drivers/staging/r8188eu/include/hal_intf.h
@@ -12,7 +12,6 @@ enum hw_variables {
        HW_VAR_SET_OPMODE,
        HW_VAR_CORRECT_TSF,
        HW_VAR_MLME_SITESURVEY,
-       HW_VAR_DM_FLAG,
        HW_VAR_DM_FUNC_RESET,
        HW_VAR_DM_FUNC_CLR,
 };

diff --git a/drivers/staging/r8188eu/os_dep/ioctl_linux.c b/drivers/staging/r8188eu/os_dep/ioctl_linux.c
index 047e9c7d38c3295ef11b1045c42d013bcb81237a..930bb4aea435ab4dfc8ff3a324d94c231d5a583b 100644 (file)
--- a/drivers/staging/r8188eu/os_dep/ioctl_linux.c
+++ b/drivers/staging/r8188eu/os_dep/ioctl_linux.c
@@ -3221,6 +3221,14 @@ static void rtw_set_dynamic_functions(struct adapter *adapter, u8 dm_func)
        }
 }
 
+static void rtw_set_dm_func_flag(struct adapter *adapter, u32 odm_flag)
+{
+       struct hal_data_8188e *haldata = &adapter->haldata;
+       struct odm_dm_struct *odmpriv = &haldata->odmpriv;
+
+       odmpriv->SupportAbility = odm_flag;
+}
+
 static int rtw_dbg_port(struct net_device *dev,
                               struct iw_request_info *info,
                               union iwreq_data *wrqu, char *extra)
@@ -3459,7 +3467,7 @@ static int rtw_dbg_port(struct net_device *dev,
                case 0x06:
                        {
                                u32 ODMFlag = (u32)(0x0f & arg);
-                               SetHwReg8188EU(padapter, HW_VAR_DM_FLAG, (u8 *)(&ODMFlag));
+                               rtw_set_dm_func_flag(padapter, ODMFlag);
                        }
                        break;
                case 0x07: