2019-05-21 19:03:52

by Hariprasad Kelam

Subject: [Patch v2] staging: rtl8723bs: core: rtw_ap: fix Unneeded variable: "ret". Return "0

Function "rtw_sta_flush" always returns 0 value.
So change return type of rtw_sta_flush from int to void.

Same thing applies for rtw_hostapd_sta_flush

Signed-off-by: Hariprasad Kelam <[email protected]>
------
Changes v2 -
change return type of rtw_sta_flush

-----
drivers/staging/rtl8723bs/core/rtw_ap.c | 7 ++-----
drivers/staging/rtl8723bs/include/rtw_ap.h | 2 +-
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 4 ++--
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 7 +++----
4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c b/drivers/staging/rtl8723bs/core/rtw_ap.c
index bc02306..19418ea 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ap.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ap.c
@@ -2189,10 +2189,9 @@ u8 ap_free_sta(
return beacon_updated;
}

-int rtw_sta_flush(struct adapter *padapter)
+void rtw_sta_flush(struct adapter *padapter)
{
struct list_head *phead, *plist;
- int ret = 0;
struct sta_info *psta = NULL;
struct sta_priv *pstapriv = &padapter->stapriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@@ -2202,7 +2201,7 @@ int rtw_sta_flush(struct adapter *padapter)
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(padapter->pnetdev));

if ((pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE)
- return ret;
+ return ;

spin_lock_bh(&pstapriv->asoc_list_lock);
phead = &pstapriv->asoc_list;
@@ -2226,8 +2225,6 @@ int rtw_sta_flush(struct adapter *padapter)
issue_deauth(padapter, bc_addr, WLAN_REASON_DEAUTH_LEAVING);

associated_clients_update(padapter, true);
-
- return ret;
}

/* called > TSR LEVEL for USB or SDIO Interface*/
diff --git a/drivers/staging/rtl8723bs/include/rtw_ap.h b/drivers/staging/rtl8723bs/include/rtw_ap.h
index fd56c9db..d6f3a3a 100644
--- a/drivers/staging/rtl8723bs/include/rtw_ap.h
+++ b/drivers/staging/rtl8723bs/include/rtw_ap.h
@@ -31,7 +31,7 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta);
void sta_info_update(struct adapter *padapter, struct sta_info *psta);
void ap_sta_info_defer_update(struct adapter *padapter, struct sta_info *psta);
u8 ap_free_sta(struct adapter *padapter, struct sta_info *psta, bool active, u16 reason);
-int rtw_sta_flush(struct adapter *padapter);
+void rtw_sta_flush(struct adapter *padapter);
void start_ap_mode(struct adapter *padapter);
void stop_ap_mode(struct adapter *padapter);

diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index db553f2..ce57e0e 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@ -2896,9 +2896,9 @@ static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndev

flush_all_cam_entry(padapter); /* clear CAM */

- ret = rtw_sta_flush(padapter);
+ rtw_sta_flush(padapter);

- return ret;
+ return 0;
}


diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
index e3d3569..a4d05f2 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
@@ -3754,7 +3754,7 @@ static int rtw_set_beacon(struct net_device *dev, struct ieee_param *param, int

}

-static int rtw_hostapd_sta_flush(struct net_device *dev)
+static void rtw_hostapd_sta_flush(struct net_device *dev)
{
/* _irqL irqL; */
/* struct list_head *phead, *plist; */
@@ -3766,8 +3766,7 @@ static int rtw_hostapd_sta_flush(struct net_device *dev)

flush_all_cam_entry(padapter); /* clear CAM */

- return rtw_sta_flush(padapter);
-
+ rtw_sta_flush(padapter);
}

static int rtw_add_sta(struct net_device *dev, struct ieee_param *param)
@@ -4254,7 +4253,7 @@ static int rtw_hostapd_ioctl(struct net_device *dev, struct iw_point *p)
switch (param->cmd) {
case RTL871X_HOSTAPD_FLUSH:

- ret = rtw_hostapd_sta_flush(dev);
+ rtw_hostapd_sta_flush(dev);

break;

--
2.7.4

2019-05-22 12:33:32

by Greg Kroah-Hartman

Subject: Re: [Patch v2] staging: rtl8723bs: core: rtw_ap: fix Unneeded variable: "ret". Return "0

On Wed, May 22, 2019 at 12:30:33AM +0530, Hariprasad Kelam wrote:
> Function "rtw_sta_flush" always returns 0 value.
> So change return type of rtw_sta_flush from int to void.
>
> Same thing applies for rtw_hostapd_sta_flush
>
> Signed-off-by: Hariprasad Kelam <[email protected]>
> ------
> Changes v2 -
> change return type of rtw_sta_flush
>
> -----
> drivers/staging/rtl8723bs/core/rtw_ap.c | 7 ++-----
> drivers/staging/rtl8723bs/include/rtw_ap.h | 2 +-
> drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 4 ++--
> drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 7 +++----
> 4 files changed, 8 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c b/drivers/staging/rtl8723bs/core/rtw_ap.c
> index bc02306..19418ea 100644
> --- a/drivers/staging/rtl8723bs/core/rtw_ap.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_ap.c
> @@ -2189,10 +2189,9 @@ u8 ap_free_sta(
> return beacon_updated;
> }
>
> -int rtw_sta_flush(struct adapter *padapter)
> +void rtw_sta_flush(struct adapter *padapter)
> {
> struct list_head *phead, *plist;
> - int ret = 0;
> struct sta_info *psta = NULL;
> struct sta_priv *pstapriv = &padapter->stapriv;
> struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
> @@ -2202,7 +2201,7 @@ int rtw_sta_flush(struct adapter *padapter)
> DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(padapter->pnetdev));
>
> if ((pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE)
> - return ret;
> + return ;

Odd use of a ' ' character here :(