staging: rtl8188eu: remove unused rtw_scan_abort()
PATCH 1/2 staging: rtl8188eu: remove unused rtw_scan_abort()
The function rtw_scan_abort() is never used, so remove it. Discovered by cppcheck.
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/rtl8188eu/core/rtw_mlme.c | 23 -------------------- drivers/staging/rtl8188eu/include/rtw_mlme.h | 1 - 2 files changed, 24 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme.c +0 -23
@@ -828,29 +828,6 @@ inline void rtw_indicate_scan_done(struct adapter *padapter, bool aborted)rtw_os_indicate_scan_done (padapter, aborted); } -void rtw_scan_abort (struct adapter *adapter) -{ -unsigned long start; -struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); -struct mlme_ext_priv *pmlmeext = &(adapter->mlmeextpriv); - - start = jiffies; - pmlmeext->scan_abort = true; -while (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY) && -jiffies_to_msecs (jiffies - start) <=200 ) { -if (adapter->bDriverStopped || adapter->bSurpriseRemoved) -break ; -DBG_88E (FUNC_NDEV_FMT "fw_state=_FW_UNDER_SURVEY!\n" ,FUNC_NDEV_ARG (adapter->pnetdev)); -msleep (20 ); - } -if (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY)) { -if (!adapter->bDriverStopped && !adapter->bSurpriseRemoved) -DBG_88E (FUNC_NDEV_FMT "waiting for scan_abort time out!\n" ,FUNC_NDEV_ARG (adapter->pnetdev)); -rtw_indicate_scan_done (adapter, true); - } - pmlmeext->scan_abort = false; -} -static struct sta_info *rtw_joinbss_update_stainfo (struct adapter *padapter,struct wlan_network *pnetwork) {int i;
drivers/staging/rtl8188eu/include/rtw_mlme.h +0 -1
@@ -311,7 +311,6 @@ void rtw_free_assoc_resources_locked(struct adapter *adapter);void rtw_indicate_disconnect (struct adapter *adapter);void rtw_indicate_connect (struct adapter *adapter);void rtw_indicate_scan_done (struct adapter *padapter,bool aborted); -void rtw_scan_abort (struct adapter *adapter);int rtw_restruct_sec_ie (struct adapter *adapter,u8 *in_ie,u8 *out_ie,uint in_len);
Signature · 1 line
2.19.0
PATCH 2/2 staging: rtl8188eu: remove rtw_qos.h
There is only one struct in rtw_qos.h and it is only included from drv_types.h. Move the struct into drv_types.h to reduce the number of header files.
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/rtl8188eu/include/drv_types.h | 7 ++++++- drivers/staging/rtl8188eu/include/rtw_qos.h | 18 ------------------ 2 files changed, 6 insertions(+), 19 deletions(-) delete mode 100644 drivers/staging/rtl8188eu/include/rtw_qos.h
drivers/staging/rtl8188eu/include/drv_types.h +6 -1
@@ -24,11 +24,16 @@#include <rtw_recv.h> #include <hal_intf.h> #include <hal_com.h> -#include <rtw_qos.h> #include <rtw_security.h> #include <rtw_pwrctrl.h> #include <rtw_eeprom.h> #include <sta_info.h> + +struct qos_priv { +/* bit mask option: u-apsd, s-apsd, ts, block ack... */ +unsigned int qos_option; +}; +#include <rtw_mlme.h> #include <rtw_debug.h> #include <rtw_rf.h>
drivers/staging/rtl8188eu/include/rtw_qos.h deleted +0 -18
@@ -1,18 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/****************************************************************************** -* -* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -* -******************************************************************************/ -#ifndef _RTW_QOS_H_ -#define _RTW_QOS_H_ - -#include <osdep_service.h> - -struct qos_priv { -unsigned int qos_option;/* bit mask option: u-apsd, -* s-apsd, ts, block ack... -*/ -}; - -#endif /* _RTL871X_QOS_H_ */
Signature · 1 line
2.19.0