redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: rtl8723bs: Replace hal_btcoex_Initialize() 

Remove hal_btcoex_Initialize as all it does is perform a memset and call
EXhalbtcoutsrc_InitlizeVariables.
Rename EXhalbtcoutsrc_InitlizeVariables to hal_btcoex_Initialize and add
the memset of hal_btcoex_Initialize in order to maintain compatibility
with call sites of the latter (EXhalbtcoutsrc is not called anywhere
else except in now-removed old hal_btcoex_Initialize).
Change return type of new hal_btcoex_Initialize from u8 to void and
remove its return statement as the return value of hal_btcoex_Initialize
is never used.
Change the type of function argument at call site to match the function
parameter of new hal_btcoex_Initialize.

Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
Link: https://lore.kernel.org/r/20190802062444.30384-4-nishkadg.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
alistair/sunxi64-5.4-dsi
Nishka Dasgupta 2019-08-02 11:54:44 +05:30 committed by Greg Kroah-Hartman
parent 365231fcd6
commit 6250a57e6c
4 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h
View File

@ -532,7 +532,6 @@ typedef struct _BTC_COEXIST {
extern BTC_COEXIST GLBtCoexist;
u8 EXhalbtcoutsrc_InitlizeVariables(void *Adapter);
void EXhalbtcoutsrc_PowerOnSetting(PBTC_COEXIST pBtCoexist);
void EXhalbtcoutsrc_InitHwConfig(PBTC_COEXIST pBtCoexist, u8 bWifiOnly);
void EXhalbtcoutsrc_InitCoexDm(PBTC_COEXIST pBtCoexist);

16
drivers/staging/rtl8723bs/hal/hal_btcoex.c
View File

@ -957,9 +957,13 @@ static u8 EXhalbtcoutsrc_BindBtCoexWithAdapter(void *padapter)
return true;
}
u8 EXhalbtcoutsrc_InitlizeVariables(void *padapter)
void hal_btcoex_Initialize(void *padapter)
{
PBTC_COEXIST pBtCoexist = &GLBtCoexist;
PBTC_COEXIST pBtCoexist;
memset(&GLBtCoexist, 0, sizeof(GLBtCoexist));
pBtCoexist = &GLBtCoexist;
/* pBtCoexist->statistics.cntBind++; */
@ -999,8 +1003,6 @@ u8 EXhalbtcoutsrc_InitlizeVariables(void *padapter)
GLBtcWiFiInScanState = false;
GLBtcWiFiInIQKState = false;
return true;
}
void EXhalbtcoutsrc_PowerOnSetting(PBTC_COEXIST pBtCoexist)
@ -1382,12 +1384,6 @@ void hal_btcoex_SetSingleAntPath(struct adapter *padapter, u8 singleAntPath)
EXhalbtcoutsrc_SetSingleAntPath(singleAntPath);
}
u8 hal_btcoex_Initialize(struct adapter *padapter)
{
memset(&GLBtCoexist, 0, sizeof(GLBtCoexist));
return EXhalbtcoutsrc_InitlizeVariables((void *)padapter);
}
void hal_btcoex_PowerOnSetting(struct adapter *padapter)
{
EXhalbtcoutsrc_PowerOnSetting(&GLBtCoexist);

2
drivers/staging/rtl8723bs/include/hal_btcoex.h
View File

@ -28,7 +28,7 @@ void hal_btcoex_SetChipType(struct adapter *padapter, u8 chipType);
void hal_btcoex_SetPgAntNum(struct adapter *padapter, u8 antNum);
void hal_btcoex_SetSingleAntPath(struct adapter *padapter, u8 singleAntPath);
u8 hal_btcoex_Initialize(struct adapter *padapter);
void hal_btcoex_Initialize(void *padapter);
void hal_btcoex_PowerOnSetting(struct adapter *padapter);
void hal_btcoex_InitHwConfig(struct adapter *padapter, u8 bWifiOnly);

2
drivers/staging/rtl8723bs/os_dep/sdio_intf.c
View File

@ -371,7 +371,7 @@ static struct adapter *rtw_sdio_if1_init(struct dvobj_priv *dvobj, const struct
rtw_hal_chip_configure(padapter);
hal_btcoex_Initialize(padapter);
hal_btcoex_Initialize((void *) padapter);
/* 3 6. read efuse/eeprom data */
rtw_hal_read_chip_info(padapter);