staging: rtl8723bs: remove typedefs in rtw_mlme.h

This commit fixes the following checkpatch.pl warnings:

    WARNING: do not add new typedefs
    #84: FILE: include/rtw_mlme.h:84:
    +typedef enum _RT_SCAN_TYPE {

    WARNING: do not add new typedefs
    #137: FILE: include/rtw_mlme.h:137:
    +typedef struct _RT_LINK_DETECT_T {

Signed-off-by: Marco Cesati <marco.cesati@gmail.com>
Link: https://lore.kernel.org/r/20210312082638.25512-3-marco.cesati@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index 3443a5764c50bfdc2eaf799b8425348e8a2320eb..8ab5b38e8fc1a78d8e85572b1958b644e9922fdd 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -4272,7 +4272,7 @@ Following are some utility functions for WiFi MLME
 void site_survey(struct adapter *padapter)
 {
        unsigned char   survey_channel = 0, val8;
-       RT_SCAN_TYPE    ScanType = SCAN_PASSIVE;
+       enum RT_SCAN_TYPE       ScanType = SCAN_PASSIVE;
        struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
        struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
        u32 initialgain = 0;

diff --git a/drivers/staging/rtl8723bs/hal/hal_btcoex.c b/drivers/staging/rtl8723bs/hal/hal_btcoex.c
index 7ac8a173245fff89d3f23c90744beb659ba5e097..35d88832de0f5b651640033ba6280e710d55d5d8 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/hal_btcoex.c
+++ b/drivers/staging/rtl8723bs/hal/hal_btcoex.c
@@ -445,7 +445,7 @@ static u8 halbtcoutsrc_Get(void *pBtcContext, u8 getType, void *pOutBuf)
 
        case BTC_GET_U4_WIFI_TRAFFIC_DIRECTION:
                {
-                       PRT_LINK_DETECT_T plinkinfo;
+                       struct RT_LINK_DETECT_T * plinkinfo;
                        plinkinfo = &padapter->mlmepriv.LinkDetectInfo;
 
                        if (plinkinfo->NumTxOkInPeriod > plinkinfo->NumRxOkInPeriod)

diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme.h b/drivers/staging/rtl8723bs/include/rtw_mlme.h
index d8655cb619a19f9c0f53dfdda1cbe92872fc5dcc..2f9c2a03e38592bdb73e91b585e32c6595643cd7 100644 (file)
--- a/drivers/staging/rtl8723bs/include/rtw_mlme.h
+++ b/drivers/staging/rtl8723bs/include/rtw_mlme.h
@@ -81,11 +81,11 @@ enum dot11AuthAlgrthmNum {
 };
 
 /*  Scan type including active and passive scan. */
-typedef enum _RT_SCAN_TYPE {
+enum RT_SCAN_TYPE {
        SCAN_PASSIVE,
        SCAN_ACTIVE,
        SCAN_MIX,
-} RT_SCAN_TYPE, *PRT_SCAN_TYPE;
+};
 
 enum  _BAND {
        GHZ24_50 = 0,
@@ -134,7 +134,7 @@ struct sitesurvey_ctrl {
        _timer  sitesurvey_ctrl_timer;
 };
 
-typedef struct _RT_LINK_DETECT_T {
+struct RT_LINK_DETECT_T {
        u32                     NumTxOkInPeriod;
        u32                     NumRxOkInPeriod;
        u32                     NumRxUnicastOkInPeriod;
@@ -147,7 +147,7 @@ typedef struct _RT_LINK_DETECT_T {
        /* u8 TrafficBusyState; */
        u8 TrafficTransitionCount;
        u32 LowPowerTransitionCount;
-} RT_LINK_DETECT_T, *PRT_LINK_DETECT_T;
+};
 
 struct profile_info {
        u8 ssidlen;
@@ -385,12 +385,12 @@ struct mlme_priv {
 
        struct ht_priv htpriv;
 
-       RT_LINK_DETECT_T        LinkDetectInfo;
+       struct RT_LINK_DETECT_T LinkDetectInfo;
        _timer  dynamic_chk_timer; /* dynamic/periodic check timer */
 
        u8 acm_mask; /*  for wmm acm mask */
        u8 ChannelPlan;
-       RT_SCAN_TYPE    scan_mode; /*  active: 1, passive: 0 */
+       enum RT_SCAN_TYPE       scan_mode; /*  active: 1, passive: 0 */
 
        u8 *wps_probe_req_ie;
        u32 wps_probe_req_ie_len;

diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
index 1567831caf914a7453492a9e33e07eff919c8224..ed6b03c253670f72c845194c0f9f95c1f0b19a35 100644 (file)
--- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
+++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
@@ -419,7 +419,7 @@ struct mlme_ext_info {
 /*  The channel information about this channel including joining, scanning, and power constraints. */
 typedef struct _RT_CHANNEL_INFO {
        u8              ChannelNum;             /*  The channel number. */
-       RT_SCAN_TYPE    ScanType;               /*  Scan type such as passive or active scan. */
+       enum RT_SCAN_TYPE       ScanType;               /*  Scan type such as passive or active scan. */
 } RT_CHANNEL_INFO, *PRT_CHANNEL_INFO;
 
 int rtw_ch_set_search_ch(RT_CHANNEL_INFO *ch_set, const u32 ch);