Skip to content

Commit

Permalink
staging: rtl8723bs: Remove rtw_btcoex_SuspendNotify()
Browse files Browse the repository at this point in the history
Remove function rtw_btcoex_SuspendNotify as all it does is call
hal_btcoex_SuspendNotify.
Modify call sites accordingly.
Issue found with Coccinelle.

Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Nishka Dasgupta authored and Greg Kroah-Hartman committed Jul 1, 2019
1 parent 7d6a6e7 commit b9c1def
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 9 deletions.
5 changes: 0 additions & 5 deletions drivers/staging/rtl8723bs/core/rtw_btcoex.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,6 @@ void rtw_btcoex_BtInfoNotify(struct adapter *padapter, u8 length, u8 *tmpBuf)
hal_btcoex_BtInfoNotify(padapter, length, tmpBuf);
}

void rtw_btcoex_SuspendNotify(struct adapter *padapter, u8 state)
{
hal_btcoex_SuspendNotify(padapter, state);
}

void rtw_btcoex_HaltNotify(struct adapter *padapter)
{
if (!padapter->bup) {
Expand Down
1 change: 0 additions & 1 deletion drivers/staging/rtl8723bs/include/rtw_btcoex.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ void rtw_btcoex_ScanNotify(struct adapter *, u8 type);
void rtw_btcoex_ConnectNotify(struct adapter *, u8 action);
void rtw_btcoex_MediaStatusNotify(struct adapter *, u8 mediaStatus);
void rtw_btcoex_BtInfoNotify(struct adapter *, u8 length, u8 *tmpBuf);
void rtw_btcoex_SuspendNotify(struct adapter *, u8 state);
void rtw_btcoex_HaltNotify(struct adapter *);
u8 rtw_btcoex_IsBtDisabled(struct adapter *);
void rtw_btcoex_Handler(struct adapter *);
Expand Down
6 changes: 3 additions & 3 deletions drivers/staging/rtl8723bs/os_dep/os_intfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -1475,10 +1475,10 @@ int rtw_suspend_common(struct adapter *padapter)

/* wait for the latest FW to remove this condition. */
if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) {
rtw_btcoex_SuspendNotify(padapter, 0);
hal_btcoex_SuspendNotify(padapter, 0);
DBG_871X("WIFI_AP_STATE\n");
} else if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true) {
rtw_btcoex_SuspendNotify(padapter, 1);
hal_btcoex_SuspendNotify(padapter, 1);
DBG_871X("STATION\n");
}

Expand Down Expand Up @@ -1829,7 +1829,7 @@ int rtw_resume_common(struct adapter *padapter)
rtw_resume_process_normal(padapter);
}

rtw_btcoex_SuspendNotify(padapter, 0);
hal_btcoex_SuspendNotify(padapter, 0);

if (pwrpriv) {
pwrpriv->bInSuspend = false;
Expand Down

0 comments on commit b9c1def

Please sign in to comment.