staging: r8188eu: bWIFI_Direct is set but never used

bWIFI_Direct in odm_dm_struct is set but never used. Remove it.

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

diff --git a/drivers/staging/r8188eu/core/rtw_p2p.c b/drivers/staging/r8188eu/core/rtw_p2p.c
index 315a9e6c5cd3cdd71eb4c55337118da6560e7196..7b30b9b64b41094233b5263562d7a60bd420b754 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_p2p.c
+++ b/drivers/staging/r8188eu/core/rtw_p2p.c
@@ -1941,7 +1941,6 @@ int rtw_p2p_enable(struct adapter *padapter, enum P2P_ROLE role)
                /* Enable P2P function */
                init_wifidirect_info(padapter, role);
 
-               rtl8188e_SetHalODMVar(padapter, HAL_ODM_P2P_STATE, NULL, true);
        } else if (role == P2P_ROLE_DISABLE) {
                if (_FAIL == rtw_pwr_wakeup(padapter)) {
                        ret = _FAIL;
@@ -1960,8 +1959,6 @@ int rtw_p2p_enable(struct adapter *padapter, enum P2P_ROLE role)
                        memset(&pwdinfo->rx_prov_disc_info, 0x00, sizeof(struct rx_provdisc_req_info));
                }
 
-               rtl8188e_SetHalODMVar(padapter, HAL_ODM_P2P_STATE, NULL, false);
-
                /* Restore to initial setting. */
                update_tx_basic_rate(padapter, padapter->registrypriv.wireless_mode);
        }

diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/hal/odm.c
index 8779d5accf52f2be98a309907fee4d6f4ddc656d..b1cebdfb7d88304d6e3fafc6d0b215b1c1677b58 100644 (file)
--- a/drivers/staging/r8188eu/hal/odm.c
+++ b/drivers/staging/r8188eu/hal/odm.c
@@ -260,9 +260,6 @@ void ODM_CmnInfoUpdate(struct odm_dm_struct *pDM_Odm, u32 CmnInfo, u64 Value)
        case    ODM_CMNINFO_ABILITY:
                pDM_Odm->SupportAbility = (u32)Value;
                break;
-       case    ODM_CMNINFO_WIFI_DIRECT:
-               pDM_Odm->bWIFI_Direct = (bool)Value;
-               break;
        case    ODM_CMNINFO_WIFI_DISPLAY:
                pDM_Odm->bWIFI_Display = (bool)Value;
                break;

diff --git a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
index d14c1757d7b3cf2f509be99e49a9871ec4626f30..d2de2817f9e83dbd45b1a50766a9c3f87bb04c83 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
@@ -874,9 +874,6 @@ void rtl8188e_SetHalODMVar(struct adapter *Adapter, enum hal_odm_variable eVaria
                       }
                }
                break;
-       case HAL_ODM_P2P_STATE:
-                       ODM_CmnInfoUpdate(podmpriv, ODM_CMNINFO_WIFI_DIRECT, bSet);
-               break;
        case HAL_ODM_WIFI_DISPLAY_STATE:
                        ODM_CmnInfoUpdate(podmpriv, ODM_CMNINFO_WIFI_DISPLAY, bSet);
                break;

diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h
index 7385ebaaba5c439464996dab994c4cc3045ab734..3383570c2bf3fb19a3a3c8c4bb45122275d533bf 100644 (file)
--- a/drivers/staging/r8188eu/include/hal_intf.h
+++ b/drivers/staging/r8188eu/include/hal_intf.h
@@ -96,7 +96,6 @@ enum hal_def_variable {
 
 enum hal_odm_variable {
        HAL_ODM_STA_INFO,
-       HAL_ODM_P2P_STATE,
        HAL_ODM_WIFI_DISPLAY_STATE,
 };
 

diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188eu/include/odm.h
index f83b94a74b70e3c0ddfea8ebf8b59fab220826f5..d6c10ac2b8a8fab67b60ae907bb41ff4a51546c7 100644 (file)
--- a/drivers/staging/r8188eu/include/odm.h
+++ b/drivers/staging/r8188eu/include/odm.h
@@ -230,7 +230,6 @@ enum odm_common_info_def {
 /*  POINTER REFERENCE----------- */
 
 /* CALL BY VALUE------------- */
-       ODM_CMNINFO_WIFI_DIRECT,
        ODM_CMNINFO_WIFI_DISPLAY,
        ODM_CMNINFO_LINK,
        ODM_CMNINFO_RSSI_MIN,
@@ -480,7 +479,6 @@ struct odm_dm_struct {
 /*  POINTER REFERENCE----------- */
        /*  */
 /* CALL BY VALUE------------- */
-       bool    bWIFI_Direct;
        bool    bWIFI_Display;
        bool    bLinked;
        u8      RSSI_Min;