drop some unnecessary wrappers
cover drop some unnecessary wrappers
Drop some unnecessary wrappers and update all the references accordingly.
Tested on Comfast CF-WU810N RTL8188EUS wireless adapter.
Vihas Makwana (6):
staging: r8188eu: drop unnecessary wrapper rtw_free_cmd_priv
staging: r8188eu: drop unnecessary wrapper rtw_init_cmd_priv
staging: r8188eu: drop unnecessary wrapper rtw_init_evt_priv
staging: r8188eu: drop unnecessary wrapper rtw_dequeue_cmd
staging: r8188eu: drop unnecessary wrapper rtw_init_mlme_priv
staging: r8188eu: drop unnecessary wrapper rtw_free_mlme_priv
drivers/staging/r8188eu/core/rtw_cmd.c | 45 ++++------------------ drivers/staging/r8188eu/core/rtw_mlme.c | 16 +------- drivers/staging/r8188eu/include/rtw_cmd.h | 8 ++-- drivers/staging/r8188eu/include/rtw_mlme.h | 3 +- drivers/staging/r8188eu/os_dep/os_intfs.c | 14 +++---- 5 files changed, 20 insertions(+), 66 deletions(-)
Signature · 1 line
2.30.2
PATCH 1/6 staging: r8188eu: drop unnecessary wrapper rtw_free_cmd_priv
Remove the unnecessary wrapper. The logic of rtw_free_cmd_priv can be moved to _rtw_free_cmd_priv.
--- drivers/staging/r8188eu/core/rtw_cmd.c | 7 +------ drivers/staging/r8188eu/include/rtw_cmd.h | 2 +- drivers/staging/r8188eu/os_dep/os_intfs.c | 4 ++-- 3 files changed, 4 insertions(+), 9 deletions(-)
drivers/staging/r8188eu/core/rtw_cmd.c +1 -6
@@ -87,7 +87,7 @@ void rtw_free_evt_priv(struct evt_priv *pevtpriv) } } -static void _rtw_free_cmd_priv (struct cmd_priv *pcmdpriv) +void _rtw_free_cmd_priv (struct cmd_priv *pcmdpriv) {if (pcmdpriv) {kfree (pcmdpriv->cmd_allocated_buf);
@@ -157,11 +157,6 @@ u32 rtw_init_evt_priv(struct evt_priv *pevtpriv)return res; } -void rtw_free_cmd_priv (struct cmd_priv *pcmdpriv) -{ -_rtw_free_cmd_priv (pcmdpriv); -} -static int rtw_cmd_filter (struct cmd_priv *pcmdpriv,struct cmd_obj *cmd_obj) {u8 bAllow = false;/* set to true to allow enqueuing cmd when hw_init_completed is false */
drivers/staging/r8188eu/include/rtw_cmd.h +1 -1
@@ -83,7 +83,7 @@ void rtw_free_cmd_obj(struct cmd_obj *pcmd);int rtw_cmd_thread (void *context);u32 rtw_init_cmd_priv (struct cmd_priv *pcmdpriv); -void rtw_free_cmd_priv (struct cmd_priv *pcmdpriv); +void _rtw_free_cmd_priv (struct cmd_priv *pcmdpriv);u32 rtw_init_evt_priv (struct evt_priv *pevtpriv);void rtw_free_evt_priv (struct evt_priv *pevtpriv);
drivers/staging/r8188eu/os_dep/os_intfs.c +2 -2
@@ -534,7 +534,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter)rtw_free_evt_priv (&padapter->evtpriv); free_cmd_priv: -rtw_free_cmd_priv (&padapter->cmdpriv); +_rtw_free_cmd_priv (&padapter->cmdpriv);return _FAIL; }
@@ -572,7 +572,7 @@ u8 rtw_free_drv_sw(struct adapter *padapter)free_mlme_ext_priv (&padapter->mlmeextpriv); -rtw_free_cmd_priv (&padapter->cmdpriv); +_rtw_free_cmd_priv (&padapter->cmdpriv);rtw_free_evt_priv (&padapter->evtpriv);
Signature · 1 line
2.30.2
Re: [PATCH 1/6] staging: r8188eu: drop unnecessary wrapper rtw_free_cmd_priv
Quoted 2 lines · Vihas Makwana
Remove the unnecessary wrapper. The logic of
rtw_free_cmd_privcan be moved to_rtw_free_cmd_priv.
If you are going to drop wrappers, my preference would be to drop the underscore prefixed ones.
Re: [PATCH 1/6] staging: r8188eu: drop unnecessary wrapper rtw_free_cmd_priv
Quoted 7 lines · Vihas Makwana
Quoted 2 lines
Remove the unnecessary wrapper. The logic of
rtw_free_cmd_privcan be moved to_rtw_free_cmd_priv.If you are going to drop wrappers, my preference would be to drop the underscore prefixed ones.
Yes, that was my initial thought too. But there are already some init and free functions in the module with underscores prefixed. So I didn't do it that way. Maybe the developers kept it that way for some reason.
Quoted 9 lines · Joe Perches
Quoted 2 lines · Vihas Makwana
Remove the unnecessary wrapper. The logic of
rtw_free_cmd_privcan be moved to_rtw_free_cmd_priv.If you are going to drop wrappers, my preference would be to drop the underscore prefixed ones.
--
Thanks,
Vihas
Re: [PATCH 1/6] staging: r8188eu: drop unnecessary wrapper rtw_free_cmd_priv
Quoted 11 lines · Vihas Makwana
Quoted 7 lines · Vihas Makwana
Quoted 2 lines
Remove the unnecessary wrapper. The logic of
rtw_free_cmd_privcan be moved to_rtw_free_cmd_priv.If you are going to drop wrappers, my preference would be to drop the underscore prefixed ones.
Yes, that was my initial thought too. But there are already some init and free functions in the module with underscores prefixed. So I didn't do it that way. Maybe the developers kept it that way for some reason.
Yeah, no. There is no reason. Get rid of the underscores.
regards,
dan carpenter
PATCH 2/6 staging: r8188eu: drop unnecessary wrapper rtw_init_cmd_priv
In reply to Vihas MakwanaRemove the unnecessary wrapper. The logic of rtw_init_cmd_priv can be moved to _rtw_init_cmd_priv.
--- drivers/staging/r8188eu/core/rtw_cmd.c | 11 +---------- drivers/staging/r8188eu/include/rtw_cmd.h | 2 +- drivers/staging/r8188eu/os_dep/os_intfs.c | 2 +- 3 files changed, 3 insertions(+), 12 deletions(-)
drivers/staging/r8188eu/core/rtw_cmd.c +1 -10
@@ -15,7 +15,7 @@* No irqsave is necessary. */ -static int _rtw_init_cmd_priv (struct cmd_priv *pcmdpriv) +int _rtw_init_cmd_priv (struct cmd_priv *pcmdpriv) {int res = _SUCCESS;
@@ -139,15 +139,6 @@ static struct cmd_obj *_rtw_dequeue_cmd(struct __queue *queue)return obj; } -u32 rtw_init_cmd_priv (struct cmd_priv *pcmdpriv) -{ -u32 res; - - res =_rtw_init_cmd_priv (pcmdpriv); - -return res; -} -u32 rtw_init_evt_priv (struct evt_priv *pevtpriv) {int res;
drivers/staging/r8188eu/include/rtw_cmd.h +1 -1
@@ -82,7 +82,7 @@ void rtw_free_cmd_obj(struct cmd_obj *pcmd);int rtw_cmd_thread (void *context); -u32 rtw_init_cmd_priv (struct cmd_priv *pcmdpriv); +int _rtw_init_cmd_priv (struct cmd_priv *pcmdpriv);void _rtw_free_cmd_priv (struct cmd_priv *pcmdpriv);u32 rtw_init_evt_priv (struct evt_priv *pevtpriv);
drivers/staging/r8188eu/os_dep/os_intfs.c +1 -1
@@ -466,7 +466,7 @@ u8 rtw_reset_drv_sw(struct adapter *padapter)u8 rtw_init_drv_sw (struct adapter *padapter) { -if ((rtw_init_cmd_priv (&padapter->cmdpriv)) == _FAIL) { +if ((_rtw_init_cmd_priv (&padapter->cmdpriv)) == _FAIL) {dev_err (dvobj_to_dev (padapter->dvobj),"rtw_init_cmd_priv failed\n" );return _FAIL; }
Signature · 1 line
2.30.2
PATCH 3/6 staging: r8188eu: drop unnecessary wrapper rtw_init_evt_priv
In reply to Vihas MakwanaRemove the unnecessary wrapper. The logic of rtw_init_evt_priv can be moved to _rtw_init_evt_priv.
--- drivers/staging/r8188eu/core/rtw_cmd.c | 11 +---------- drivers/staging/r8188eu/include/rtw_cmd.h | 2 +- drivers/staging/r8188eu/os_dep/os_intfs.c | 2 +- 3 files changed, 3 insertions(+), 12 deletions(-)
drivers/staging/r8188eu/core/rtw_cmd.c +1 -10
@@ -58,7 +58,7 @@ int _rtw_init_cmd_priv(struct cmd_priv *pcmdpriv)static void c2h_wk_callback (struct work_struct *work); -static int _rtw_init_evt_priv (struct evt_priv *pevtpriv) +int _rtw_init_evt_priv (struct evt_priv *pevtpriv) {int res = _SUCCESS;
@@ -139,15 +139,6 @@ static struct cmd_obj *_rtw_dequeue_cmd(struct __queue *queue)return obj; } -u32 rtw_init_evt_priv (struct evt_priv *pevtpriv) -{ -int res; - - res =_rtw_init_evt_priv (pevtpriv); - -return res; -} -static int rtw_cmd_filter (struct cmd_priv *pcmdpriv,struct cmd_obj *cmd_obj) {u8 bAllow = false;/* set to true to allow enqueuing cmd when hw_init_completed is false */
drivers/staging/r8188eu/include/rtw_cmd.h +1 -1
@@ -85,7 +85,7 @@ int rtw_cmd_thread(void *context);int _rtw_init_cmd_priv (struct cmd_priv *pcmdpriv);void _rtw_free_cmd_priv (struct cmd_priv *pcmdpriv); -u32 rtw_init_evt_priv (struct evt_priv *pevtpriv); +int _rtw_init_evt_priv (struct evt_priv *pevtpriv);void rtw_free_evt_priv (struct evt_priv *pevtpriv);void rtw_evt_notify_isr (struct evt_priv *pevtpriv);u8 p2p_protocol_wk_cmd (struct adapter *padapter,int intCmdType);
drivers/staging/r8188eu/os_dep/os_intfs.c +1 -1
@@ -473,7 +473,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter) padapter->cmdpriv.padapter = padapter; -if ((rtw_init_evt_priv (&padapter->evtpriv)) == _FAIL) { +if ((_rtw_init_evt_priv (&padapter->evtpriv)) == _FAIL) {dev_err (dvobj_to_dev (padapter->dvobj),"rtw_init_evt_priv failed\n" ); goto free_cmd_priv; }
Signature · 1 line
2.30.2
PATCH 4/6 staging: r8188eu: drop unnecessary wrapper rtw_dequeue_cmd
In reply to Vihas MakwanaRemove the unnecessary wrapper. The logic of rtw_dequeue_cmd can be moved to _rtw_dequeue_cmd.
--- drivers/staging/r8188eu/core/rtw_cmd.c | 16 ++++------------ drivers/staging/r8188eu/include/rtw_cmd.h | 2 +- 2 files changed, 5 insertions(+), 13 deletions(-)
drivers/staging/r8188eu/core/rtw_cmd.c +4 -12
@@ -121,10 +121,11 @@ static int _rtw_enqueue_cmd(struct __queue *queue, struct cmd_obj *obj)return _SUCCESS; } -static struct cmd_obj *_rtw_dequeue_cmd (struct __queue *queue) +struct cmd_obj *_rtw_dequeue_cmd (struct cmd_priv *pcmdpriv) {struct cmd_obj *obj;unsigned long flags; +struct __queue *queue = &pcmdpriv->cmd_queue;spin_lock_irqsave (&queue->lock, flags);if (list_empty (&queue->queue)) {
@@ -178,15 +179,6 @@ u32 rtw_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)return res; } -struct cmd_obj *rtw_dequeue_cmd (struct cmd_priv *pcmdpriv) -{ -struct cmd_obj *cmd_obj; - - cmd_obj =_rtw_dequeue_cmd (&pcmdpriv->cmd_queue); - -return cmd_obj; -} -void rtw_free_cmd_obj (struct cmd_obj *pcmd) {
@@ -230,7 +222,7 @@ int rtw_cmd_thread(void *context) padapter->bSurpriseRemoved)break ; - pcmd =rtw_dequeue_cmd (pcmdpriv); + pcmd =_rtw_dequeue_cmd (pcmdpriv);if (!pcmd)continue ;
@@ -280,7 +272,7 @@ int rtw_cmd_thread(void *context)/* free all cmd_obj resources */ do { - pcmd = rtw_dequeue_cmd(pcmdpriv); + pcmd = _rtw_dequeue_cmd(pcmdpriv); if (!pcmd) break;
drivers/staging/r8188eu/include/rtw_cmd.h +1 -1
@@ -77,7 +77,7 @@ struct c2h_evt_hdr {#define c2h_evt_exist (c2h_evt) ((c2h_evt)->id || (c2h_evt)->plen)u32 rtw_enqueue_cmd (struct cmd_priv *pcmdpriv,struct cmd_obj *obj); -struct cmd_obj *rtw_dequeue_cmd (struct cmd_priv *pcmdpriv); +struct cmd_obj *_rtw_dequeue_cmd (struct cmd_priv *pcmdpriv);void rtw_free_cmd_obj (struct cmd_obj *pcmd);int rtw_cmd_thread (void *context);
Signature · 1 line
2.30.2
PATCH 5/6 staging: r8188eu: drop unnecessary wrapper rtw_init_mlme_priv
In reply to Vihas MakwanaRemove the unnecessary wrapper. The logic of rtw_init_mlme_priv can be moved to _rtw_init_mlme_priv.
--- drivers/staging/r8188eu/core/rtw_mlme.c | 11 +---------- drivers/staging/r8188eu/include/rtw_mlme.h | 2 +- drivers/staging/r8188eu/os_dep/os_intfs.c | 2 +- 3 files changed, 3 insertions(+), 12 deletions(-)
drivers/staging/r8188eu/core/rtw_mlme.c +1 -10
@@ -30,7 +30,7 @@ u8 rtw_to_roaming(struct adapter *adapter)return adapter->mlmepriv.to_roaming; } -static int _rtw_init_mlme_priv (struct adapter *padapter) +int _rtw_init_mlme_priv (struct adapter *padapter) {int i;u8 *pbuf;
@@ -288,15 +288,6 @@ u8 *rtw_get_beacon_interval_from_ie(u8 *ie)return ie +8 ; } -int rtw_init_mlme_priv (struct adapter *padapter)/* struct mlme_priv *pmlmepriv) */ -{ -int res; - - res =_rtw_init_mlme_priv (padapter);/* (pmlmepriv); */ - -return res; -} -void rtw_free_mlme_priv (struct mlme_priv *pmlmepriv) {_rtw_free_mlme_priv (pmlmepriv);
drivers/staging/r8188eu/include/rtw_mlme.h +1 -1
@@ -438,7 +438,7 @@ int event_thread(void *context);void rtw_join_timeout_handler (struct timer_list *t);void _rtw_scan_timeout_handler (struct timer_list *t);void rtw_free_network_queue (struct adapter *adapter,u8 isfreeall); -int rtw_init_mlme_priv (struct adapter *adapter); +int _rtw_init_mlme_priv (struct adapter *adapter);void rtw_free_mlme_priv (struct mlme_priv *pmlmepriv);int rtw_select_and_join_from_scanned_queue (struct mlme_priv *pmlmepriv); int rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv,
drivers/staging/r8188eu/os_dep/os_intfs.c +1 -1
@@ -478,7 +478,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter) goto free_cmd_priv; } -if (rtw_init_mlme_priv (padapter) == _FAIL) { +if (_rtw_init_mlme_priv (padapter) == _FAIL) {dev_err (dvobj_to_dev (padapter->dvobj),"rtw_init_mlme_priv failed\n" ); goto free_evt_priv; }
Signature · 1 line
2.30.2
PATCH 6/6 staging: r8188eu: drop unnecessary wrapper rtw_free_mlme_priv
In reply to Vihas MakwanaRemove the unnecessary wrapper. Drop rtw_free_mlme_priv and use _rtw_free_mlme_priv instead.
--- drivers/staging/r8188eu/core/rtw_mlme.c | 5 ----- drivers/staging/r8188eu/include/rtw_mlme.h | 1 - drivers/staging/r8188eu/os_dep/os_intfs.c | 4 ++-- 3 files changed, 2 insertions(+), 8 deletions(-)
drivers/staging/r8188eu/core/rtw_mlme.c +0 -5
@@ -288,11 +288,6 @@ u8 *rtw_get_beacon_interval_from_ie(u8 *ie)return ie +8 ; } -void rtw_free_mlme_priv (struct mlme_priv *pmlmepriv) -{ -_rtw_free_mlme_priv (pmlmepriv); -} -static struct wlan_network *rtw_alloc_network (struct mlme_priv *pmlmepriv) {struct wlan_network *pnetwork;
drivers/staging/r8188eu/include/rtw_mlme.h +0 -1
@@ -439,7 +439,6 @@ void rtw_join_timeout_handler (struct timer_list *t);void _rtw_scan_timeout_handler (struct timer_list *t);void rtw_free_network_queue (struct adapter *adapter,u8 isfreeall);int _rtw_init_mlme_priv (struct adapter *adapter); -void rtw_free_mlme_priv (struct mlme_priv *pmlmepriv);int rtw_select_and_join_from_scanned_queue (struct mlme_priv *pmlmepriv);int rtw_set_key (struct adapter *adapter,struct security_priv *psecuritypriv,int keyid,u8 set_tx);
drivers/staging/r8188eu/os_dep/os_intfs.c +2 -2
@@ -528,7 +528,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter) free_mlme_ext:free_mlme_ext_priv (&padapter->mlmeextpriv); -rtw_free_mlme_priv (&padapter->mlmepriv); +_rtw_free_mlme_priv (&padapter->mlmepriv); free_evt_priv:rtw_free_evt_priv (&padapter->evtpriv);
@@ -576,7 +576,7 @@ u8 rtw_free_drv_sw(struct adapter *padapter)rtw_free_evt_priv (&padapter->evtpriv); -rtw_free_mlme_priv (&padapter->mlmepriv); +_rtw_free_mlme_priv (&padapter->mlmepriv);_rtw_free_xmit_priv (&padapter->xmitpriv);_rtw_free_sta_priv (&padapter->stapriv);/* will free bcmc_stainfo here */
Signature · 1 line
2.30.2