staging: rtl8723bs: core: rtw_ap: fix Unneeded variable: "ret". Return "0
PATCH v4 1/1 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
Changes v3 -
fix indentaion issue
Changes v4 -
prepare patch on linux-next
---
--- 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(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +2 -5
@@ -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*/
drivers/staging/rtl8723bs/include/rtw_ap.h +1 -1
@@ -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);
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +2 -2
@@ -2870,9 +2870,9 @@ static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndevflush_all_cam_entry (padapter);/* clear CAM */ - ret =rtw_sta_flush (padapter); +rtw_sta_flush (padapter); -return ret; +return 0 ; }
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +3 -4
@@ -3753,7 +3753,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; */
@@ -3765,8 +3765,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)
@@ -4253,7 +4252,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 ;
Signature · 1 line
2.7.4
Greg Kroah-Hartman
maintainerQuoted 2 lines · Hariprasad Kelam
Function "
rtw_sta_flush" always returns 0 value. So change
return type ofrtw_sta_flushfrom int to void.
Odd line wrapping :(
Also your subject line is missing a trailing '"' character :(
v5?
thanks,
greg k-h