staging: r8188eu: two simple cleanups
cover staging: r8188eu: two simple cleanups
This series contains two simple cleanup patches.
Tested on x86_64 with Inter-Tech DMG-02.
Michael Straube (2):
staging: r8188eu: remove extern from function prototypes
staging: r8188eu: convert rtw_free_stainfo() to void
drivers/staging/r8188eu/core/rtw_sta_mgt.c | 8 ++------ .../staging/r8188eu/include/osdep_service.h | 2 +- drivers/staging/r8188eu/include/rtw_mlme_ext.h | 4 ++-- drivers/staging/r8188eu/include/sta_info.h | 18 +++++++++--------- 4 files changed, 14 insertions(+), 18 deletions(-)
Signature · 1 line
2.38.0
PATCH 1/2 staging: r8188eu: remove extern from function prototypes
Declaring function prototypes extern is redundant and triggers checkpatch warnings. Remove all extern from function prototypes.
--- .../staging/r8188eu/include/osdep_service.h | 2 +- drivers/staging/r8188eu/include/rtw_mlme_ext.h | 4 ++-- drivers/staging/r8188eu/include/sta_info.h | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-)
drivers/staging/r8188eu/include/osdep_service.h +1 -1
@@ -66,7 +66,7 @@ static inline int rtw_netif_queue_stopped(struct net_device *pnetdev)netif_tx_queue_stopped (netdev_get_tx_queue (pnetdev,3 )); } -extern int RTW_STATUS_CODE (int error_code); +int RTW_STATUS_CODE (int error_code);void *rtw_malloc2d (int h,int w,int size);
drivers/staging/r8188eu/include/rtw_mlme_ext.h +2 -2
@@ -388,7 +388,7 @@ struct mlme_ext_priv {void init_mlme_ext_priv (struct adapter *adapter);int init_hw_mlme_ext (struct adapter *padapter);void free_mlme_ext_priv (struct mlme_ext_priv *pmlmeext); -extern struct xmit_frame *alloc_mgtxmitframe (struct xmit_priv *pxmitpriv); +struct xmit_frame *alloc_mgtxmitframe (struct xmit_priv *pxmitpriv);unsigned char networktype_to_raid (unsigned char network_type);u8 judge_network_type (struct adapter *padapter,unsigned char *rate,int len);
@@ -483,7 +483,7 @@ void report_add_sta_event(struct adapter *padapter, unsigned char *addr, int cam_idx);void beacon_timing_control (struct adapter *padapter); -extern u8 set_tx_beacon_cmd (struct adapter *padapter); +u8 set_tx_beacon_cmd (struct adapter *padapter);unsigned int setup_beacon_frame (struct adapter *padapter,unsigned char *beacon_frame);void update_mgnt_tx_rate (struct adapter *padapter,u8 rate);
drivers/staging/r8188eu/include/sta_info.h +9 -9
@@ -295,19 +295,19 @@ static inline u32 wifi_mac_hash(u8 *mac)return x; } -extern int _rtw_init_sta_priv (struct sta_priv *pstapriv); -extern void _rtw_free_sta_priv (struct sta_priv *pstapriv); +int _rtw_init_sta_priv (struct sta_priv *pstapriv); +void _rtw_free_sta_priv (struct sta_priv *pstapriv);#define stainfo_offset_valid (offset) (offset < NUM_STA && offset >= 0)int rtw_stainfo_offset (struct sta_priv *stapriv,struct sta_info *sta);struct sta_info *rtw_get_stainfo_by_offset (struct sta_priv *stapriv,int off); -extern struct sta_info *rtw_alloc_stainfo (struct sta_priv *stapriv,u8 *hwaddr); -extern u32 rtw_free_stainfo (struct adapter *adapt,struct sta_info *psta); -extern void rtw_free_all_stainfo (struct adapter *adapt); -extern struct sta_info *rtw_get_stainfo (struct sta_priv *stapriv,u8 *hwaddr); -extern u32 rtw_init_bcmc_stainfo (struct adapter *adapt); -extern struct sta_info *rtw_get_bcmc_stainfo (struct adapter *padapter); -extern u8 rtw_access_ctrl (struct adapter *padapter,u8 *mac_addr); +struct sta_info *rtw_alloc_stainfo (struct sta_priv *stapriv,u8 *hwaddr); +u32 rtw_free_stainfo (struct adapter *adapt,struct sta_info *psta); +void rtw_free_all_stainfo (struct adapter *adapt); +struct sta_info *rtw_get_stainfo (struct sta_priv *stapriv,u8 *hwaddr); +u32 rtw_init_bcmc_stainfo (struct adapter *adapt); +struct sta_info *rtw_get_bcmc_stainfo (struct adapter *padapter); +u8 rtw_access_ctrl (struct adapter *padapter,u8 *mac_addr);#endif /* _STA_INFO_H_ */
Signature · 1 line
2.38.0
PATCH 2/2 staging: r8188eu: convert rtw_free_stainfo() to void
In reply to Michael StraubeThe function rtw_free_stainfo() returns always _SUCCESS and none of its callers uses the return value. We can safely make the function void. Yet another tiny step towards getting rid of _FAIL / _SUCCESS.
--- drivers/staging/r8188eu/core/rtw_sta_mgt.c | 8 ++------ drivers/staging/r8188eu/include/sta_info.h | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-)
drivers/staging/r8188eu/core/rtw_sta_mgt.c +2 -6
@@ -242,7 +242,7 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr) }/* using pstapriv->sta_hash_lock to protect */ -u32 rtw_free_stainfo (struct adapter *padapter,struct sta_info *psta) +void rtw_free_stainfo (struct adapter *padapter,struct sta_info *psta) {int i;struct __queue *pfree_sta_queue;
@@ -252,7 +252,7 @@ u32 rtw_free_stainfo(struct adapter *padapter, struct sta_info *psta)struct sta_priv *pstapriv = &padapter->stapriv;if (!psta) - goto exit; +return ; pfree_sta_queue = &pstapriv->free_sta_queue;
@@ -356,10 +356,6 @@ u32 rtw_free_stainfo(struct adapter *padapter, struct sta_info *psta)spin_lock_bh (&pfree_sta_queue->lock);list_add_tail (&psta->list,get_list_head (pfree_sta_queue));spin_unlock_bh (&pfree_sta_queue->lock); - -exit: - -return _SUCCESS; }/* free all stainfo which in sta_hash[all] */
drivers/staging/r8188eu/include/sta_info.h +1 -1
@@ -303,7 +303,7 @@ int rtw_stainfo_offset(struct sta_priv *stapriv, struct sta_info *sta);struct sta_info *rtw_get_stainfo_by_offset (struct sta_priv *stapriv,int off);struct sta_info *rtw_alloc_stainfo (struct sta_priv *stapriv,u8 *hwaddr); -u32 rtw_free_stainfo (struct adapter *adapt,struct sta_info *psta); +void rtw_free_stainfo (struct adapter *adapt,struct sta_info *psta);void rtw_free_all_stainfo (struct adapter *adapt);struct sta_info *rtw_get_stainfo (struct sta_priv *stapriv,u8 *hwaddr);u32 rtw_init_bcmc_stainfo (struct adapter *adapt);
Signature · 1 line
2.38.0
Quoted 7 lines · Michael Straube
This series contains two simple cleanup patches.
Tested onx86_64with Inter-Tech DMG-02.Michael Straube (2):
staging: r8188eu: remove extern from function prototypes
staging: r8188eu: convertrtw_free_stainfo()to void
Quoted 6 lines
drivers/staging/r8188eu/core/rtw_sta_mgt.c | 8 ++------ .../staging/r8188eu/include/osdep_service.h | 2 +- drivers/staging/r8188eu/include/rtw_mlme_ext.h | 4 ++-- drivers/staging/r8188eu/include/sta_info.h | 18 +++++++++--------- 4 files changed, 14 insertions(+), 18 deletions(-)