Commit eb569cc0 authored by Nishka Dasgupta's avatar Nishka Dasgupta Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: core: Replace function Set_MSR() 



Remove function Set_NETYPE0_MSR as it only has one line and it is only
called by one other function, Set_MSR.
Replace contents of Set_MSR with the contents of Set_NETYPE0_MSR as
Set_MSR does nothing except call Set_NETYPE0_MSR.
Issue found with Coccinelle.

Signed-off-by: default avatarNishka Dasgupta <nishkadg.linux@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 65699f34

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c

+1 −1
Original line number Diff line number Diff line
@@ -6036,7 +6036,7 @@ u8 setopmode_hdl(struct adapter *padapter, u8 *pbuf) 
	}



	rtw_hal_set_hwreg(padapter, HW_VAR_SET_OPMODE, (u8 *)(&type));

	/* Set_NETYPE0_MSR(padapter, type); */

	/* Set_MSR(padapter, type); */





#ifdef CONFIG_AUTO_AP_MODE

drivers/staging/rtl8723bs/core/rtw_wlan_util.c

+1 −6
Original line number Diff line number Diff line
@@ -302,14 +302,9 @@ void Switch_DM_Func(struct adapter *padapter, u32 mode, u8 enable) 
		rtw_hal_set_hwreg(padapter, HW_VAR_DM_FUNC_CLR, (u8 *)(&mode));

}



static void Set_NETYPE0_MSR(struct adapter *padapter, u8 type)

{

	rtw_hal_set_hwreg(padapter, HW_VAR_MEDIA_STATUS, (u8 *)(&type));

}



void Set_MSR(struct adapter *padapter, u8 type)

{

	Set_NETYPE0_MSR(padapter, type);

	rtw_hal_set_hwreg(padapter, HW_VAR_MEDIA_STATUS, (u8 *)(&type));

}



inline u8 rtw_get_oper_ch(struct adapter *adapter)