Staging: rtl8188eu: Refactor conditional code to increase readability

Remove the nested conditionals. The if and else-if have the same
code so they are combined to make the code more compact.

Signed-off-by: Vatika Harlalka <vatikaharlalka@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/hal/phy.c b/drivers/staging/rtl8188eu/hal/phy.c
index d94ce61647b6bcb5825d93482c1f6ca28e44e7a3..c8d8abcde16d09575d6a62f8cf4b810cb13f1aaa 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/phy.c
+++ b/drivers/staging/rtl8188eu/hal/phy.c
@@ -506,18 +506,12 @@ void rtl88eu_dm_txpower_tracking_callback_thermalmeter(struct adapter *adapt)
                temp_cck = dm_odm->RFCalibrateInfo.RegA24;
 
                for (i = 0; i < CCK_TABLE_SIZE; i++) {
-                       if (dm_odm->RFCalibrateInfo.bCCKinCH14) {
-                               if (memcmp(&temp_cck, &CCKSwingTable_Ch14[i][2], 4)) {
+                       if ((dm_odm->RFCalibrateInfo.bCCKinCH14 &&
+                               memcmp(&temp_cck, &CCKSwingTable_Ch14[i][2], 4)) ||
+                               memcmp(&temp_cck, &CCKSwingTable_Ch1_Ch13[i][2], 4)) {
                                        cck_index_old = (u8)i;
                                        dm_odm->BbSwingIdxCckBase = (u8)i;
                                        break;
-                               }
-                       } else {
-                               if (memcmp(&temp_cck, &CCKSwingTable_Ch1_Ch13[i][2], 4)) {
-                                       cck_index_old = (u8)i;
-                                       dm_odm->BbSwingIdxCckBase = (u8)i;
-                                       break;
-                               }
                        }
                }