staging: r8188eu: remove GetHalDefVar8188EUsb()

The local variable odm_flag in rtw_dbg_port() is set but never used.
This are the last two remaining calls to GetHalDefVar8188EUsb(). Both
calls can be removed and we finally can remove GetHalDefVar8188EUsb()
itself. 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/20220405104910.9769-5-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 77580191d9db9f63e0e875e72f84066f4f2ad14e..285282b5fe35782429f804bafd23cbfdcf0f4d35 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -1194,20 +1194,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)
 
 }
 
-/* Query setting of specified variable. */
-void GetHalDefVar8188EUsb(struct adapter *Adapter, enum hal_def_variable eVariable, void *pValue)
-{
-       struct hal_data_8188e *haldata = &Adapter->haldata;
-
-       switch (eVariable) {
-       case HAL_DEF_DBG_DM_FUNC:
-               *((u32 *)pValue) = haldata->odmpriv.SupportAbility;
-               break;
-       default:
-               break;
-       }
-}
-
 /* Change default setting of specified variable. */
 void SetHalDefVar8188EUsb(struct adapter *Adapter, enum hal_def_variable eVariable, void *pValue)
 {

diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h
index 0bc274a695d937b98036d48bf784bf8b18867fc4..ab6cab1281ab0733d38282ae81f7af616e616e2c 100644 (file)
--- a/drivers/staging/r8188eu/include/hal_intf.h
+++ b/drivers/staging/r8188eu/include/hal_intf.h
@@ -52,7 +52,6 @@ int rtl8188e_IOL_exec_cmds_sync(struct adapter *adapter,
                                struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt);
 
 void SetHalDefVar8188EUsb(struct adapter *Adapter, enum hal_def_variable eVariable, void *pValue);
-void GetHalDefVar8188EUsb(struct adapter *Adapter, enum hal_def_variable eVariable, void *pValue);
 
 unsigned int rtl8188eu_inirp_init(struct adapter *Adapter);
 

diff --git a/drivers/staging/r8188eu/os_dep/ioctl_linux.c b/drivers/staging/r8188eu/os_dep/ioctl_linux.c
index d127cebb6eaead3c22413e677aadc57564711015..b6851628e4d2f774b96f806e112a04c6a7f5c37e 100644 (file)
--- a/drivers/staging/r8188eu/os_dep/ioctl_linux.c
+++ b/drivers/staging/r8188eu/os_dep/ioctl_linux.c
@@ -3675,22 +3675,16 @@ static int rtw_dbg_port(struct net_device *dev,
                        break;
                case 0xee:/* turn on/off dynamic funcs */
                        {
-                               u32 odm_flag;
-
-                               if (0xf == extra_arg) {
-                                       GetHalDefVar8188EUsb(padapter, HAL_DEF_DBG_DM_FUNC, &odm_flag);
-                               } else {
+                               if (extra_arg != 0xf) {
                                        /*      extra_arg = 0  - disable all dynamic func
                                                extra_arg = 1  - disable DIG
                                                extra_arg = 2  - disable tx power tracking
                                                extra_arg = 3  - turn on all dynamic func
                                        */
                                        SetHalDefVar8188EUsb(padapter, HAL_DEF_DBG_DM_FUNC, &extra_arg);
-                                       GetHalDefVar8188EUsb(padapter, HAL_DEF_DBG_DM_FUNC, &odm_flag);
                                }
                        }
                        break;
-
                case 0xfd:
                        rtw_write8(padapter, 0xc50, arg);
                        rtw_write8(padapter, 0xc58, arg);