Merge tag 'staging-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-2.6-microblaze.git] / drivers / staging / rtl8188eu / core / rtw_efuse.c

diff --git a/drivers/staging/rtl8188eu/core/rtw_efuse.c b/drivers/staging/rtl8188eu/core/rtw_efuse.c
index d9b0f9e..c525682 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_efuse.c
+++ b/drivers/staging/rtl8188eu/core/rtw_efuse.c
@@ -402,7 +402,6 @@ static u16 Efuse_GetCurrentSize(struct adapter *pAdapter)
 int Efuse_PgPacketRead(struct adapter *pAdapter, u8 offset, u8 *data)
 {
        u8 ReadState = PG_STATE_HEADER;
-       int     bContinual = true;
        int     bDataEmpty = true;
        u8 efuse_data, word_cnts = 0;
        u16     efuse_addr = 0;
@@ -422,7 +421,7 @@ int Efuse_PgPacketRead(struct adapter *pAdapter, u8 offset, u8 *data)
        /*  <Roger_TODO> Efuse has been pre-programmed dummy 5Bytes at the end of Efuse by CP. */
        /*  Skip dummy parts to prevent unexpected data read from Efuse. */
        /*  By pass right now. 2009.02.19. */
-       while (bContinual && AVAILABLE_EFUSE_ADDR(efuse_addr)) {
+       while (AVAILABLE_EFUSE_ADDR(efuse_addr)) {
                /*   Header Read ------------- */
                if (ReadState & PG_STATE_HEADER) {
                        if (efuse_OneByteRead(pAdapter, efuse_addr, &efuse_data) && (efuse_data != 0xFF)) {
@@ -464,7 +463,7 @@ int Efuse_PgPacketRead(struct adapter *pAdapter, u8 offset, u8 *data)
                                        ReadState = PG_STATE_HEADER;
                                }
                        } else {
-                               bContinual = false;
+                               break;
                        }
                } else if (ReadState & PG_STATE_DATA) {
                        /*   Data section Read ------------- */
@@ -498,8 +497,8 @@ static bool hal_EfuseFixHeaderProcess(struct adapter *pAdapter, u8 efuseType, st
 
                        if (!PgWriteSuccess)
                                return false;
-                       else
-                               efuse_addr = Efuse_GetCurrentSize(pAdapter);
+
+                       efuse_addr = Efuse_GetCurrentSize(pAdapter);
                } else {
                        efuse_addr = efuse_addr + (pFixPkt->word_cnts * 2) + 1;
                }
@@ -714,10 +713,9 @@ static bool hal_EfusePartialWriteCheck(struct adapter *pAdapter, u8 efuseType, u
                                if (ALL_WORDS_DISABLED(efuse_data)) {
                                        ret = false;
                                        break;
-                               } else {
-                                       curPkt.offset = ((cur_header & 0xE0) >> 5) | ((efuse_data & 0xF0) >> 1);
-                                       curPkt.word_en = efuse_data & 0x0F;
                                }
+                               curPkt.offset = ((cur_header & 0xE0) >> 5) | ((efuse_data & 0xF0) >> 1);
+                               curPkt.word_en = efuse_data & 0x0F;
                        } else {
                                cur_header  =  efuse_data;
                                curPkt.offset = (cur_header >> 4) & 0x0F;