staging: rtl8723au: rtw_pwrctrl.c: Eliminate CONFIG_8723AU_BT_COEXIST #ifdefs (280e7a0b) · Commits · 戴 / test

drivers/staging/rtl8723au/core/rtw_pwrctrl.c

+3 −6

Original line number	Diff line number	Diff line
		@@ -20,9 +20,7 @@
		#include <rtl8723a_cmd.h>
		#include <rtw_sreset.h>

		#ifdef CONFIG_8723AU_BT_COEXIST
		#include <rtl8723a_hal.h>
		#endif
		#include <rtl8723a_bt_intf.h>
		#include <usb_ops_linux.h>

		void ips_enter23a(struct rtw_adapter * padapter)
		@@ -38,9 +36,8 @@ void ips_enter23a(struct rtw_adapter * padapter)

		pwrpriv->ips_enter23a_cnts++;
		DBG_8723A("==>ips_enter23a cnts:%d\n", pwrpriv->ips_enter23a_cnts);
		#ifdef CONFIG_8723AU_BT_COEXIST
		BTDM_TurnOffBtCoexistBeforeEnterIPS(padapter);
		#endif
		rtl8723a_BT_disable_coexist(padapter);

		if (pwrpriv->change_rfpwrstate == rf_off) {
		pwrpriv->bpower_saving = true;
		DBG_8723A_LEVEL(_drv_always_, "nolinked power save enter\n");

+1 −1

Original line number	Diff line number	Diff line
		@@ -10726,7 +10726,7 @@ void BTDM_CoexAllOff(struct rtw_adapter *padapter)
		BTDM_HWCoexAllOff(padapter);
		}

		void BTDM_TurnOffBtCoexistBeforeEnterIPS(struct rtw_adapter *padapter)
		void rtl8723a_BT_disable_coexist(struct rtw_adapter *padapter)
		{
		struct pwrctrl_priv *ppwrctrl = &padapter->pwrctrlpriv;

+2 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ void rtl8723a_BT_mediastatus_notify(struct rtw_adapter *padapter,
		enum rt_media_status mstatus);
		void rtl8723a_BT_specialpacket_notify(struct rtw_adapter *padapter);
		void rtl8723a_BT_lps_leave(struct rtw_adapter *padapter);
		void rtl8723a_BT_disable_coexist(struct rtw_adapter *padapter);
		#else
		static inline bool rtl8723a_BT_using_antenna_1(struct rtw_adapter *padapter)
		{
		@@ -47,6 +48,7 @@ static inline bool rtl8723a_BT_coexist(struct rtw_adapter *padapter)
		#define rtl8723a_BT_mediastatus_notify(padapter, mstatus) do {} while(0)
		#define rtl8723a_BT_specialpacket_notify(padapter) do {} while(0)
		#define rtl8723a_BT_lps_leave(padapter) do {} while(0)
		#define rtl8723a_BT_disable_coexist(padapter) do {} while(0)
		#endif

		#endif