staging: rtl8192e: reduce indentation level

Reduce indentation level in _rtl92e_dm_rx_path_sel_byrssi() by negating
if statements and use continue in for loops. This way the indentation
level of the code that is covered by the if checks can be reduced. This
improves readability and clears two checkpatch warnings.

WARNING: Too many leading tabs - consider code refactoring

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Reviewed-by: Nam Cao <namcao@linutronix.de>
Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org>
Link: https://lore.kernel.org/r/20240527094527.2046-2-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
index aebe67f1a46df3927e0e3449a7c96405eba8569f..2fda44c5a4123c99893513169148eb8f7b8dec07 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
@@ -1335,51 +1335,52 @@ static void _rtl92e_dm_rx_path_sel_byrssi(struct net_device *dev)
        for (i = 0; i < RF90_PATH_MAX; i++) {
                dm_rx_path_sel_table.rf_rssi[i] = priv->stats.rx_rssi_percentage[i];
 
-               if (priv->brfpath_rxenable[i]) {
-                       rf_num++;
-                       cur_rf_rssi = dm_rx_path_sel_table.rf_rssi[i];
-
-                       if (rf_num == 1) {
-                               max_rssi_index = min_rssi_index = sec_rssi_index = i;
-                               tmp_max_rssi = tmp_min_rssi = tmp_sec_rssi = cur_rf_rssi;
-                       } else if (rf_num == 2) {
-                               if (cur_rf_rssi >= tmp_max_rssi) {
-                                       tmp_max_rssi = cur_rf_rssi;
-                                       max_rssi_index = i;
-                               } else {
-                                       tmp_sec_rssi = tmp_min_rssi = cur_rf_rssi;
-                                       sec_rssi_index = min_rssi_index = i;
-                               }
+               if (!priv->brfpath_rxenable[i])
+                       continue;
+
+               rf_num++;
+               cur_rf_rssi = dm_rx_path_sel_table.rf_rssi[i];
+
+               if (rf_num == 1) {
+                       max_rssi_index = min_rssi_index = sec_rssi_index = i;
+                       tmp_max_rssi = tmp_min_rssi = tmp_sec_rssi = cur_rf_rssi;
+               } else if (rf_num == 2) {
+                       if (cur_rf_rssi >= tmp_max_rssi) {
+                               tmp_max_rssi = cur_rf_rssi;
+                               max_rssi_index = i;
                        } else {
-                               if (cur_rf_rssi > tmp_max_rssi) {
-                                       tmp_sec_rssi = tmp_max_rssi;
-                                       sec_rssi_index = max_rssi_index;
-                                       tmp_max_rssi = cur_rf_rssi;
-                                       max_rssi_index = i;
-                               } else if (cur_rf_rssi == tmp_max_rssi) {
-                                       tmp_sec_rssi = cur_rf_rssi;
-                                       sec_rssi_index = i;
-                               } else if ((cur_rf_rssi < tmp_max_rssi) &&
-                                          (cur_rf_rssi > tmp_sec_rssi)) {
+                               tmp_sec_rssi = tmp_min_rssi = cur_rf_rssi;
+                               sec_rssi_index = min_rssi_index = i;
+                       }
+               } else {
+                       if (cur_rf_rssi > tmp_max_rssi) {
+                               tmp_sec_rssi = tmp_max_rssi;
+                               sec_rssi_index = max_rssi_index;
+                               tmp_max_rssi = cur_rf_rssi;
+                               max_rssi_index = i;
+                       } else if (cur_rf_rssi == tmp_max_rssi) {
+                               tmp_sec_rssi = cur_rf_rssi;
+                               sec_rssi_index = i;
+                       } else if ((cur_rf_rssi < tmp_max_rssi) &&
+                                       (cur_rf_rssi > tmp_sec_rssi)) {
+                               tmp_sec_rssi = cur_rf_rssi;
+                               sec_rssi_index = i;
+                       } else if (cur_rf_rssi == tmp_sec_rssi) {
+                               if (tmp_sec_rssi == tmp_min_rssi) {
                                        tmp_sec_rssi = cur_rf_rssi;
                                        sec_rssi_index = i;
-                               } else if (cur_rf_rssi == tmp_sec_rssi) {
-                                       if (tmp_sec_rssi == tmp_min_rssi) {
-                                               tmp_sec_rssi = cur_rf_rssi;
-                                               sec_rssi_index = i;
-                                       }
-                               } else if ((cur_rf_rssi < tmp_sec_rssi) &&
-                                          (cur_rf_rssi > tmp_min_rssi)) {
-                                       ;
-                               } else if (cur_rf_rssi == tmp_min_rssi) {
-                                       if (tmp_sec_rssi == tmp_min_rssi) {
-                                               tmp_min_rssi = cur_rf_rssi;
-                                               min_rssi_index = i;
-                                       }
-                               } else if (cur_rf_rssi < tmp_min_rssi) {
+                               }
+                       } else if ((cur_rf_rssi < tmp_sec_rssi) &&
+                                       (cur_rf_rssi > tmp_min_rssi)) {
+                               ;
+                       } else if (cur_rf_rssi == tmp_min_rssi) {
+                               if (tmp_sec_rssi == tmp_min_rssi) {
                                        tmp_min_rssi = cur_rf_rssi;
                                        min_rssi_index = i;
                                }
+                       } else if (cur_rf_rssi < tmp_min_rssi) {
+                               tmp_min_rssi = cur_rf_rssi;
+                               min_rssi_index = i;
                        }
                }
        }
@@ -1387,59 +1388,60 @@ static void _rtl92e_dm_rx_path_sel_byrssi(struct net_device *dev)
        rf_num = 0;
        if (dm_rx_path_sel_table.cck_method == CCK_Rx_Version_2) {
                for (i = 0; i < RF90_PATH_MAX; i++) {
-                       if (priv->brfpath_rxenable[i]) {
-                               rf_num++;
-                               cur_cck_pwdb =
-                                        dm_rx_path_sel_table.cck_pwdb_sta[i];
+                       if (!priv->brfpath_rxenable[i])
+                               continue;
 
-                               if (rf_num == 1) {
+                       rf_num++;
+                       cur_cck_pwdb =
+                                       dm_rx_path_sel_table.cck_pwdb_sta[i];
+
+                       if (rf_num == 1) {
+                               cck_rx_ver2_max_index = i;
+                               cck_rx_ver2_sec_index = i;
+                               tmp_cck_max_pwdb = cur_cck_pwdb;
+                               tmp_cck_min_pwdb = cur_cck_pwdb;
+                               tmp_cck_sec_pwdb = cur_cck_pwdb;
+                       } else if (rf_num == 2) {
+                               if (cur_cck_pwdb >= tmp_cck_max_pwdb) {
+                                       tmp_cck_max_pwdb = cur_cck_pwdb;
                                        cck_rx_ver2_max_index = i;
+                               } else {
+                                       tmp_cck_sec_pwdb = cur_cck_pwdb;
+                                       tmp_cck_min_pwdb = cur_cck_pwdb;
                                        cck_rx_ver2_sec_index = i;
+                               }
+                       } else {
+                               if (cur_cck_pwdb > tmp_cck_max_pwdb) {
+                                       tmp_cck_sec_pwdb =
+                                                       tmp_cck_max_pwdb;
+                                       cck_rx_ver2_sec_index =
+                                                       cck_rx_ver2_max_index;
                                        tmp_cck_max_pwdb = cur_cck_pwdb;
-                                       tmp_cck_min_pwdb = cur_cck_pwdb;
+                                       cck_rx_ver2_max_index = i;
+                               } else if (cur_cck_pwdb ==
+                                               tmp_cck_max_pwdb) {
                                        tmp_cck_sec_pwdb = cur_cck_pwdb;
-                               } else if (rf_num == 2) {
-                                       if (cur_cck_pwdb >= tmp_cck_max_pwdb) {
-                                               tmp_cck_max_pwdb = cur_cck_pwdb;
-                                               cck_rx_ver2_max_index = i;
-                                       } else {
-                                               tmp_cck_sec_pwdb = cur_cck_pwdb;
-                                               tmp_cck_min_pwdb = cur_cck_pwdb;
-                                               cck_rx_ver2_sec_index = i;
-                                       }
-                               } else {
-                                       if (cur_cck_pwdb > tmp_cck_max_pwdb) {
+                                       cck_rx_ver2_sec_index = i;
+                               } else if (PWDB_IN_RANGE) {
+                                       tmp_cck_sec_pwdb = cur_cck_pwdb;
+                                       cck_rx_ver2_sec_index = i;
+                               } else if (cur_cck_pwdb ==
+                                               tmp_cck_sec_pwdb) {
+                                       if (tmp_cck_sec_pwdb ==
+                                               tmp_cck_min_pwdb) {
                                                tmp_cck_sec_pwdb =
-                                                        tmp_cck_max_pwdb;
+                                                               cur_cck_pwdb;
                                                cck_rx_ver2_sec_index =
-                                                        cck_rx_ver2_max_index;
-                                               tmp_cck_max_pwdb = cur_cck_pwdb;
-                                               cck_rx_ver2_max_index = i;
-                                       } else if (cur_cck_pwdb ==
-                                                  tmp_cck_max_pwdb) {
-                                               tmp_cck_sec_pwdb = cur_cck_pwdb;
-                                               cck_rx_ver2_sec_index = i;
-                                       } else if (PWDB_IN_RANGE) {
-                                               tmp_cck_sec_pwdb = cur_cck_pwdb;
-                                               cck_rx_ver2_sec_index = i;
-                                       } else if (cur_cck_pwdb ==
-                                                  tmp_cck_sec_pwdb) {
-                                               if (tmp_cck_sec_pwdb ==
-                                                   tmp_cck_min_pwdb) {
-                                                       tmp_cck_sec_pwdb =
-                                                                cur_cck_pwdb;
-                                                       cck_rx_ver2_sec_index =
-                                                                i;
-                                               }
-                                       } else if ((cur_cck_pwdb < tmp_cck_sec_pwdb) &&
-                                                  (cur_cck_pwdb > tmp_cck_min_pwdb)) {
-                                               ;
-                                       } else if (cur_cck_pwdb == tmp_cck_min_pwdb) {
-                                               if (tmp_cck_sec_pwdb == tmp_cck_min_pwdb)
-                                                       tmp_cck_min_pwdb = cur_cck_pwdb;
-                                       } else if (cur_cck_pwdb < tmp_cck_min_pwdb) {
-                                               tmp_cck_min_pwdb = cur_cck_pwdb;
+                                                               i;
                                        }
+                               } else if ((cur_cck_pwdb < tmp_cck_sec_pwdb) &&
+                                               (cur_cck_pwdb > tmp_cck_min_pwdb)) {
+                                       ;
+                               } else if (cur_cck_pwdb == tmp_cck_min_pwdb) {
+                                       if (tmp_cck_sec_pwdb == tmp_cck_min_pwdb)
+                                               tmp_cck_min_pwdb = cur_cck_pwdb;
+                               } else if (cur_cck_pwdb < tmp_cck_min_pwdb) {
+                                       tmp_cck_min_pwdb = cur_cck_pwdb;
                                }
                        }
                }