Merge tag 'lsk-v3.10-android-14.12'

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / rockchip_wlan / rtl8723bs / hal / OUTSRC-BTCoexist / HalBtc8192e1Ant.c

diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/OUTSRC-BTCoexist/HalBtc8192e1Ant.c b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/OUTSRC-BTCoexist/HalBtc8192e1Ant.c
index a9b90c6acd63f6e505239316461463256c7c4f61..36a48d08213864db3e6bf89ec42427e5d323861a 100755 (executable)
--- a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/OUTSRC-BTCoexist/HalBtc8192e1Ant.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/OUTSRC-BTCoexist/HalBtc8192e1Ant.c
@@ -2437,9 +2437,17 @@ halbtc8192e1ant_InitCoexDm(
 // extern function start with EXhalbtc8192e1ant_\r
 //============================================================\r
 VOID\r
-EXhalbtc8192e1ant_InitHwConfig(\r
+EXhalbtc8192e1ant_PowerOnSetting(\r
        IN      PBTC_COEXIST            pBtCoexist\r
        )\r
+{\r
+}\r
+\r
+VOID\r
+EXhalbtc8192e1ant_InitHwConfig(\r
+       IN      PBTC_COEXIST            pBtCoexist,\r
+       IN      BOOLEAN                         bWifiOnly\r
+       )\r
 {\r
        u4Byte  u4Tmp=0;\r
        u2Byte  u2Tmp=0;\r
@@ -2536,13 +2544,6 @@ EXhalbtc8192e1ant_DisplayCoexInfo(
                CL_PRINTF(cliBuf);\r
        }\r
 \r
-       if(!pBoardInfo->bBtExist)\r
-       {\r
-               CL_SPRINTF(cliBuf, BT_TMP_BUF_SIZE, "\r\n BT not exists !!!");\r
-               CL_PRINTF(cliBuf);\r
-               return;\r
-       }\r
-\r
        CL_SPRINTF(cliBuf, BT_TMP_BUF_SIZE, "\r\n %-35s = %d/ %d ", "Ant PG number/ Ant mechanism:", \\r
                pBoardInfo->pgAntNum, pBoardInfo->btdmAntNum);\r
        CL_PRINTF(cliBuf);      \r