OSDN Git Service

staging: rtl8188eu: refactor rtw_hal_antdiv_before_linked()
authorMichael Straube <straube.linux@gmail.com>
Tue, 14 Jan 2020 13:44:18 +0000 (14:44 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 14 Jan 2020 13:59:47 +0000 (14:59 +0100)
Refactor rtw_hal_antdiv_before_linked() to clear checkpatch warnings.

WARNING: line over 80 characters
WARNING: else is not generally useful after a break or return

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20200114134422.13598-1-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8188eu/hal/rtl8188e_dm.c

index 545d6a6..0aa5e93 100644 (file)
@@ -197,15 +197,16 @@ u8 rtw_hal_antdiv_before_linked(struct adapter *Adapter)
        if (check_fwstate(pmlmepriv, _FW_LINKED))
                return false;
 
-       if (dm_swat_tbl->SWAS_NoLink_State == 0) {
-               /* switch channel */
-               dm_swat_tbl->SWAS_NoLink_State = 1;
-               dm_swat_tbl->CurAntenna = (dm_swat_tbl->CurAntenna == Antenna_A) ? Antenna_B : Antenna_A;
-
-               rtw_antenna_select_cmd(Adapter, dm_swat_tbl->CurAntenna, false);
-               return true;
-       } else {
+       if (dm_swat_tbl->SWAS_NoLink_State != 0) {
                dm_swat_tbl->SWAS_NoLink_State = 0;
                return false;
        }
+
+       /* switch channel */
+       dm_swat_tbl->SWAS_NoLink_State = 1;
+       dm_swat_tbl->CurAntenna = (dm_swat_tbl->CurAntenna == Antenna_A) ?
+                                 Antenna_B : Antenna_A;
+
+       rtw_antenna_select_cmd(Adapter, dm_swat_tbl->CurAntenna, false);
+       return true;
 }