From 9838ee1cc2eae4ee194824836a9ab8636e498652 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 30 Jan 2022 20:03:17 +0100 Subject: [PATCH] staging: r8188eu: merge Set_NETYPE0_MSR() and Set_MSR() Set_MSR() just calls Set_NETYPE0_MSR(). Merge the two functions. Keep Set_MSR() and remove Set_NETYPE0_MSR(). Signed-off-by: Michael Straube Link: https://lore.kernel.org/r/20220130190321.7172-9-straube.linux@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/r8188eu/core/rtw_wlan_util.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging/r8188eu/core/rtw_wlan_util.c index d28929a95108d..a8acec776b799 100644 --- a/drivers/staging/r8188eu/core/rtw_wlan_util.c +++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c @@ -284,7 +284,7 @@ void Switch_DM_Func(struct adapter *padapter, u32 mode, u8 enable) SetHwReg8188EU(padapter, HW_VAR_DM_FUNC_CLR, (u8 *)(&mode)); } -static void Set_NETYPE0_MSR(struct adapter *padapter, u8 type) +void Set_MSR(struct adapter *padapter, u8 type) { u8 val8; @@ -293,11 +293,6 @@ static void Set_NETYPE0_MSR(struct adapter *padapter, u8 type) rtw_write8(padapter, MSR, val8); } -void Set_MSR(struct adapter *padapter, u8 type) -{ - Set_NETYPE0_MSR(padapter, type); -} - inline u8 rtw_get_oper_ch(struct adapter *adapter) { return adapter->mlmeextpriv.oper_channel; -- 2.30.2