Merge tag 'iwlwifi-for-kalle-2015-12-16' of https://git.kernel.org/pub/scm/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / staging / rtl8723au / hal / rtl8723a_bt-coexist.c

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c b/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c
index 049adea5f9dea11b5c3c32edff05c0b637798947..d5c48a56d4aca7b63c892d5f20670f2177eba610 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c
@@ -5549,7 +5549,7 @@ static s8 btdm_1AntTdmaJudgement(struct rtw_adapter *padapter, u8 retry)
 {
        struct hal_data_8723a *pHalData;
        struct btdm_8723a_1ant *pBtdm8723;
-       static s8 up, dn, m = 1, n = 3, WaitCount;
+       static s8 up, dn, m = 1, WaitCount;
        s8 ret;
 
        pHalData = GET_HAL_DATA(padapter);
@@ -5560,7 +5560,6 @@ static s8 btdm_1AntTdmaJudgement(struct rtw_adapter *padapter, u8 retry)
                up = 0;
                dn = 0;
                m = 1;
-               n = 3;
                WaitCount = 0;
        } else {
                WaitCount++;
@@ -5575,8 +5574,6 @@ static s8 btdm_1AntTdmaJudgement(struct rtw_adapter *padapter, u8 retry)
                if (up >= 3*m) {
                        /*  retry = 0 in consecutive 3m*(2s), add WiFi duration */
                        ret = 1;
-
-                       n = 3;
                        up = 0;
                        dn = 0;
                        WaitCount = 0;
@@ -5647,7 +5644,7 @@ static void btdm_1AntTdmaDurationAdjustForACL(struct rtw_adapter *padapter)
                    (pBtdm8723->curPsTdma != 11)) {
                        btdm_1AntSetPSTDMA(padapter, true, 0, true, pBtdm8723->psTdmaDuAdjType);
                } else {
-                       s32 judge = 0;
+                       s32 judge;
 
                        judge = btdm_1AntTdmaJudgement(padapter, pHalData->bt_coexist.halCoex8723.btRetryCnt);
                        if (judge == -1) {
@@ -9078,7 +9075,7 @@ static void btdm_BTCoexist8723AHandler(struct rtw_adapter *padapter)
 u32 BTDM_BtTxRxCounterH(struct rtw_adapter *padapter)
 {
        struct hal_data_8723a *pHalData = GET_HAL_DATA(padapter);
-       u32     counters = 0;
+       u32     counters;
 
        counters = pHalData->bt_coexist.halCoex8723.highPriorityTx+
                pHalData->bt_coexist.halCoex8723.highPriorityRx;
@@ -9088,7 +9085,7 @@ u32 BTDM_BtTxRxCounterH(struct rtw_adapter *padapter)
 u32 BTDM_BtTxRxCounterL(struct rtw_adapter *padapter)
 {
        struct hal_data_8723a *pHalData = GET_HAL_DATA(padapter);
-       u32     counters = 0;
+       u32     counters;
 
        counters = pHalData->bt_coexist.halCoex8723.lowPriorityTx+
                pHalData->bt_coexist.halCoex8723.lowPriorityRx;
@@ -9300,7 +9297,7 @@ static void BTDM_AdjustForBtOperation8723A(struct rtw_adapter *padapter)
 static void BTDM_FwC2hBtRssi8723A(struct rtw_adapter *padapter, u8 *tmpBuf)
 {
        struct hal_data_8723a *pHalData = GET_HAL_DATA(padapter);
-       u8 percent = 0, u1tmp = 0;
+       u8 percent, u1tmp;
 
        u1tmp = tmpBuf[0];
        percent = u1tmp*2+10;