staging: rtl8188eu: Efuse_GetCurrentSize(): Remove parameter bool test
authornavin patidar <navin.patidar@gmail.com>
Fri, 20 Jun 2014 14:59:36 +0000 (20:29 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 20 Jun 2014 16:52:33 +0000 (09:52 -0700)
test is always false.

Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8188eu/core/rtw_efuse.c
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
drivers/staging/rtl8188eu/include/rtw_efuse.h

index ecfd311175f49c889f08bb5fdc8ea32219bdcffa..dfbb774c2a6d97b1f96ed7ffe9bd110dd262a253 100644 (file)
@@ -215,7 +215,7 @@ u16 efuse_GetMaxSize(struct adapter *padapter)
 u8 efuse_GetCurrentSize(struct adapter *padapter, u16 *size)
 {
        Efuse_PowerSwitch(padapter, false, true);
-       *size = Efuse_GetCurrentSize(padapter, false);
+       *size = Efuse_GetCurrentSize(padapter);
        Efuse_PowerSwitch(padapter, false, false);
 
        return _SUCCESS;
index 7ef23130f11d4224e858b744b4873b43da6fd350..61bff1a806b862e8845ed2d5050b34497e037a0e 100644 (file)
@@ -934,17 +934,14 @@ u8 Efuse_WordEnableDataWrite(struct adapter *pAdapter, u16 efuse_addr, u8 word_e
        return badworden;
 }
 
-u16 Efuse_GetCurrentSize(struct adapter *pAdapter, bool bPseudoTest)
+u16 Efuse_GetCurrentSize(struct adapter *pAdapter)
 {
        int     bContinual = true;
        u16     efuse_addr = 0;
        u8 hoffset = 0, hworden = 0;
        u8 efuse_data, word_cnts = 0;
 
-       if (bPseudoTest)
-               efuse_addr = (u16)(fakeEfuseUsedBytes);
-       else
-               rtw_hal_get_hwreg(pAdapter, HW_VAR_EFUSE_BYTES, (u8 *)&efuse_addr);
+       rtw_hal_get_hwreg(pAdapter, HW_VAR_EFUSE_BYTES, (u8 *)&efuse_addr);
 
        while (bContinual &&
               efuse_OneByteRead(pAdapter, efuse_addr, &efuse_data) &&
@@ -973,10 +970,7 @@ u16 Efuse_GetCurrentSize(struct adapter *pAdapter, bool bPseudoTest)
                }
        }
 
-       if (bPseudoTest)
-               fakeEfuseUsedBytes = efuse_addr;
-       else
-               rtw_hal_set_hwreg(pAdapter, HW_VAR_EFUSE_BYTES, (u8 *)&efuse_addr);
+       rtw_hal_set_hwreg(pAdapter, HW_VAR_EFUSE_BYTES, (u8 *)&efuse_addr);
 
        return efuse_addr;
 }
@@ -1085,7 +1079,7 @@ static bool hal_EfuseFixHeaderProcess(struct adapter *pAdapter, u8 efuseType, st
                        if (!PgWriteSuccess)
                                return false;
                        else
-                               efuse_addr = Efuse_GetCurrentSize(pAdapter, bPseudoTest);
+                               efuse_addr = Efuse_GetCurrentSize(pAdapter);
                } else {
                        efuse_addr = efuse_addr + (pFixPkt->word_cnts*2) + 1;
                }
@@ -1374,7 +1368,7 @@ hal_EfusePgCheckAvailableAddr(
        /* Change to check TYPE_EFUSE_MAP_LEN , because 8188E raw 256, logic map over 256. */
        EFUSE_GetEfuseDefinition(pAdapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&efuse_max_available_len);
 
-       if (Efuse_GetCurrentSize(pAdapter, bPseudoTest) >= efuse_max_available_len)
+       if (Efuse_GetCurrentSize(pAdapter) >= efuse_max_available_len)
                return false;
        return true;
 }
index fc873887c174ffd6c6195471e26561c070f7945c..23a0168d79db2d27d10c3d093c1680fc95889f40 100644 (file)
@@ -123,7 +123,7 @@ u8 rtw_efuse_access(struct adapter *adapter, u8 read, u16 start_addr,
                    u16 cnts, u8 *data);
 u8 rtw_efuse_map_read(struct adapter *adapter, u16 addr, u16 cnts, u8 *data);
 u8 rtw_efuse_map_write(struct adapter *adapter, u16 addr, u16 cnts, u8 *data);
-u16 Efuse_GetCurrentSize(struct adapter *adapter, bool test);
+u16 Efuse_GetCurrentSize(struct adapter *adapter);
 u8 Efuse_CalculateWordCnts(u8 word_en);
 void EFUSE_GetEfuseDefinition(struct adapter *adapt, u8 type, u8 type1,
                              void *out);