staging: rtl8192u: Refactor heavy nesting

This patch fixes warnings raised by checkpatch.pl relating to heavily indented
lines in r8192U_dm.c by refactoring code to achieve the same outcome indented by
one less tab.

Signed-off-by: Lorenzo Stoakes <lstoakes@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192u/r8192U_dm.c b/drivers/staging/rtl8192u/r8192U_dm.c
index 1893336..ee6b936 100644 (file)
--- a/drivers/staging/rtl8192u/r8192U_dm.c
+++ b/drivers/staging/rtl8192u/r8192U_dm.c
@@ -2566,28 +2566,25 @@ static void dm_rxpath_sel_byrssi(struct net_device *dev)
                                                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) { /* let sec and min point to the different index */
+                                       } else if (cur_cck_pwdb == tmp_cck_max_pwdb) {
+                                               /* let sec and min point to the different index */
                                                tmp_cck_sec_pwdb = cur_cck_pwdb;
                                                cck_rx_ver2_sec_index = i;
                                        } else if ((cur_cck_pwdb < tmp_cck_max_pwdb) && (cur_cck_pwdb > tmp_cck_sec_pwdb)) {
                                                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) { /* let sec and min point to the different index */
-                                                       tmp_cck_sec_pwdb = cur_cck_pwdb;
-                                                       cck_rx_ver2_sec_index = i;
-                                               } else {
-                                                       /*  This case we don't need to set any index */
-                                               }
+                                       } else if (cur_cck_pwdb == tmp_cck_sec_pwdb && tmp_cck_sec_pwdb == tmp_cck_min_pwdb) {
+                                               /* let sec and min point to the different index */
+                                               tmp_cck_sec_pwdb = cur_cck_pwdb;
+                                               cck_rx_ver2_sec_index = i;
+                                               /* otherwise we don't need to set any index */
                                        } else if ((cur_cck_pwdb < tmp_cck_sec_pwdb) && (cur_cck_pwdb > tmp_cck_min_pwdb)) {
                                                /*  This case we don't need to set any index */
-                                       } else if (cur_cck_pwdb == tmp_cck_min_pwdb) {
-                                               if (tmp_cck_sec_pwdb == tmp_cck_min_pwdb) { /*  let sec and min point to the different index */
-                                                       tmp_cck_min_pwdb = cur_cck_pwdb;
-                                                       cck_rx_ver2_min_index = i;
-                                               } else {
-                                                       /*  This case we don't need to set any index */
-                                               }
+                                       } else if (cur_cck_pwdb == tmp_cck_min_pwdb && tmp_cck_sec_pwdb == tmp_cck_min_pwdb) {
+                                               /*  let sec and min point to the different index */
+                                               tmp_cck_min_pwdb = cur_cck_pwdb;
+                                               cck_rx_ver2_min_index = i;
+                                               /* otherwise we don't need to set any index */
                                        } else if (cur_cck_pwdb < tmp_cck_min_pwdb) {
                                                tmp_cck_min_pwdb = cur_cck_pwdb;
                                                cck_rx_ver2_min_index = i;