Commit b9eb3126 authored by Martin Kaiser's avatar Martin Kaiser Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: make rtw_handle_dualmac a void function 



The rtw_handle_dualmac function always returns _SUCCESS. Remove the return
value and update the one caller that checks it.

Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Signed-off-by: default avatarMartin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220730143939.671951-3-martin@kaiser.cx


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 57f14afa

drivers/staging/r8188eu/core/rtw_wlan_util.c

+1 −4
Original line number Diff line number Diff line
@@ -1578,10 +1578,8 @@ void beacon_timing_control(struct adapter *padapter) 


static struct adapter *pbuddy_padapter;



int rtw_handle_dualmac(struct adapter *adapter, bool init)

void rtw_handle_dualmac(struct adapter *adapter, bool init)

{

	int status = _SUCCESS;



	if (init) {

		if (!pbuddy_padapter) {

			pbuddy_padapter = adapter;
@@ -1594,5 +1592,4 @@ int rtw_handle_dualmac(struct adapter *adapter, bool init) 
	} else {

		pbuddy_padapter = NULL;

	}

	return status;

}

drivers/staging/r8188eu/include/drv_types.h

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ struct adapter { 


#define adapter_to_dvobj(adapter) (adapter->dvobj)



int rtw_handle_dualmac(struct adapter *adapter, bool init);

void rtw_handle_dualmac(struct adapter *adapter, bool init);



static inline u8 *myid(struct eeprom_priv *peepriv)

{

drivers/staging/r8188eu/os_dep/usb_intf.c

+1 −3
Original line number Diff line number Diff line
@@ -306,8 +306,7 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj, 


	padapter->hw_init_mutex = &usb_drv->hw_init_mutex;



	if (rtw_handle_dualmac(padapter, 1) != _SUCCESS)

		goto free_adapter;

	rtw_handle_dualmac(padapter, 1);



	pnetdev = rtw_init_netdev(padapter);

	if (!pnetdev)
@@ -370,7 +369,6 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj, 
	rtw_free_drv_sw(padapter);

handle_dualmac:

	rtw_handle_dualmac(padapter, 0);

free_adapter:

	if (pnetdev)

		rtw_free_netdev(pnetdev);

	else