staging: rtl8188eu: refactor Efuse_GetCurrentSize()

Refactor while loop in Efuse_GetCurrentSize() to reduce indentation
level and clear line over 80 characters checkpatch warnings.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/20200329100450.10126-1-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/core/rtw_efuse.c b/drivers/staging/rtl8188eu/core/rtw_efuse.c
index c525682..9bb3ec0 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_efuse.c
+++ b/drivers/staging/rtl8188eu/core/rtw_efuse.c
@@ -370,28 +370,27 @@ static u16 Efuse_GetCurrentSize(struct adapter *pAdapter)
 
        while (efuse_OneByteRead(pAdapter, efuse_addr, &efuse_data) &&
               AVAILABLE_EFUSE_ADDR(efuse_addr)) {
-               if (efuse_data != 0xFF) {
-                       if ((efuse_data & 0x1F) == 0x0F) {              /* extended header */
-                               hoffset = efuse_data;
+               if (efuse_data == 0xFF)
+                       break;
+               if ((efuse_data & 0x1F) == 0x0F) { /* extended header */
+                       hoffset = efuse_data;
+                       efuse_addr++;
+                       efuse_OneByteRead(pAdapter, efuse_addr, &efuse_data);
+                       if ((efuse_data & 0x0F) == 0x0F) {
                                efuse_addr++;
-                               efuse_OneByteRead(pAdapter, efuse_addr, &efuse_data);
-                               if ((efuse_data & 0x0F) == 0x0F) {
-                                       efuse_addr++;
-                                       continue;
-                               } else {
-                                       hoffset = ((hoffset & 0xE0) >> 5) | ((efuse_data & 0xF0) >> 1);
-                                       hworden = efuse_data & 0x0F;
-                               }
+                               continue;
                        } else {
-                               hoffset = (efuse_data >> 4) & 0x0F;
-                               hworden =  efuse_data & 0x0F;
+                               hoffset = ((hoffset & 0xE0) >> 5) |
+                                         ((efuse_data & 0xF0) >> 1);
+                               hworden = efuse_data & 0x0F;
                        }
-                       word_cnts = Efuse_CalculateWordCnts(hworden);
-                       /* read next header */
-                       efuse_addr = efuse_addr + (word_cnts * 2) + 1;
                } else {
-                       break;
+                       hoffset = (efuse_data >> 4) & 0x0F;
+                       hworden =  efuse_data & 0x0F;
                }
+               word_cnts = Efuse_CalculateWordCnts(hworden);
+               /* read next header */
+               efuse_addr = efuse_addr + (word_cnts * 2) + 1;
        }
 
        rtw_hal_set_hwreg(pAdapter, HW_VAR_EFUSE_BYTES, (u8 *)&efuse_addr);