Skip to contentSkip to conversation

staging: r8188eu: convert two functions to void

PATCH In review Michael Straube 2 participants 4 messages Oct 2, 2022 – Oct 3, 2022 Staging

lore
Share & tools
lore

Michael Straube

author
#0 lore raw

cover staging: r8188eu: convert two functions to void

This series converts two functions return type from u8 to void as part of getting rid of _FAIL / _SUCCESS.

Tested on x86_64 with Inter-Tech DMG-02.

Michael Straube (2):
staging: r8188eu: convert rtw_reset_drv_sw() to void
staging: r8188eu: convert rtw_free_drv_sw() to void

 drivers/staging/r8188eu/include/osdep_intf.h | 4 ++--
 drivers/staging/r8188eu/os_dep/os_intfs.c    | 8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)
Signature · 1 line
2.37.3
author
#1 lore raw

PATCH 1/2 staging: r8188eu: convert rtw_reset_drv_sw() to void

The function rtw_reset_drv_sw() always returns _SUCCESS. None of its callers use the return value. Convert the return type of that function from u8 to void. This is part of getting rid of _FAIL / _SUCCESS.

Signed-off-by Michael Straube <[email protected]>
---
 drivers/staging/r8188eu/include/osdep_intf.h | 2 +-
 drivers/staging/r8188eu/os_dep/os_intfs.c    | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)
drivers/staging/r8188eu/include/osdep_intf.h +1 -1
index 36511c469546..ce8e1bc4a61c 100644
@@ -44,7 +44,7 @@ int netdev_close(struct net_device *pnetdev);
 
 u8 rtw_init_drv_sw(struct adapter *padapter);
 u8 rtw_free_drv_sw(struct adapter *padapter);
-u8 rtw_reset_drv_sw(struct adapter *padapter);
+void rtw_reset_drv_sw(struct adapter *padapter);
 
 u32 rtw_start_drv_threads(struct adapter *padapter);
 void rtw_stop_drv_threads (struct adapter *padapter);
drivers/staging/r8188eu/os_dep/os_intfs.c +1 -3
index e43ef7e5ba70..2983e665bd5c 100644
@@ -433,7 +433,7 @@ static void rtw_init_default_value(struct adapter *padapter)
 	padapter->bShowGetP2PState = 1;
 }
 
-u8 rtw_reset_drv_sw(struct adapter *padapter)
+void rtw_reset_drv_sw(struct adapter *padapter)
 {
 	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
 

@@ -455,8 +455,6 @@ u8 rtw_reset_drv_sw(struct adapter *padapter)
 	padapter->mlmeextpriv.sitesurvey_res.state = SCAN_DISABLE;
 
 	rtw_set_signal_stat_timer(&padapter->recvpriv);
-
-	return _SUCCESS;
 }
 
 u8 rtw_init_drv_sw(struct adapter *padapter)
Signature · 1 line
2.37.3
author
#2 lore raw

PATCH 2/2 staging: r8188eu: convert rtw_free_drv_sw() to void

In reply to Michael Straube

The function rtw_free_drv_sw() always returns _SUCCESS. None of its callers use the return value. Convert the return type of that function from u8 to void. This is part of getting rid of _FAIL / _SUCCESS.

Signed-off-by Michael Straube <[email protected]>
---
 drivers/staging/r8188eu/include/osdep_intf.h | 2 +-
 drivers/staging/r8188eu/os_dep/os_intfs.c    | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)
drivers/staging/r8188eu/include/osdep_intf.h +1 -1
index ce8e1bc4a61c..0f7d74a3ff6d 100644
@@ -43,7 +43,7 @@ int netdev_open(struct net_device *pnetdev);
 int netdev_close(struct net_device *pnetdev);
 
 u8 rtw_init_drv_sw(struct adapter *padapter);
-u8 rtw_free_drv_sw(struct adapter *padapter);
+void rtw_free_drv_sw(struct adapter *padapter);
 void rtw_reset_drv_sw(struct adapter *padapter);
 
 u32 rtw_start_drv_threads(struct adapter *padapter);
drivers/staging/r8188eu/os_dep/os_intfs.c +1 -3
index 2983e665bd5c..38e324754c8f 100644
@@ -548,7 +548,7 @@ void rtw_cancel_all_timer(struct adapter *padapter)
 	_cancel_timer_ex(&padapter->recvpriv.signal_stat_timer);
 }
 
-u8 rtw_free_drv_sw(struct adapter *padapter)
+void rtw_free_drv_sw(struct adapter *padapter)
 {
 	/* we can call rtw_p2p_enable here, but: */
 	/*  1. rtw_p2p_enable may have IO operation */

@@ -585,8 +585,6 @@ u8 rtw_free_drv_sw(struct adapter *padapter)
 	/*  clear pbuddystruct adapter to avoid access wrong pointer. */
 	if (padapter->pbuddy_adapter)
 		padapter->pbuddy_adapter->pbuddy_adapter = NULL;
-
-	return _SUCCESS;
 }
 
 void netdev_br_init(struct net_device *netdev)
Signature · 1 line
2.37.3
Tested-by on the v1 series
#3 lore raw
In reply to Michael Straube
Quoted 5 lines · Michael Straube

This series converts two functions return type from u8 to void as part of getting rid of _FAIL / _SUCCESS.

Tested on x86_64 with Inter-Tech DMG-02.

Quoted 8 lines

Michael Straube (2):
staging: r8188eu: convert rtw_reset_drv_sw() to void
staging: r8188eu: convert rtw_free_drv_sw() to void

  drivers/staging/r8188eu/include/osdep_intf.h | 4 ++--
  drivers/staging/r8188eu/os_dep/os_intfs.c    | 8 ++------
  2 files changed, 4 insertions(+), 8 deletions(-)
Tested-by Philipp Hortmann <[email protected]> # Edimax N150