staging: rtl8192e: Remove unchanged variable frame_sync_monitor

Remove unchanged variable frame_sync_monitor and equations that have
always the same result to shorten code.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/0c4bdca5f5dbb93bb05c6b7f32136d4dfb3b0e4b.1681627603.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
index 0eca73e4540fe0bb14fa117ed23580b98232a393..c97e315a90919b9d3ebce015f32f64f9a5f6429f 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
@@ -382,8 +382,6 @@ struct r8192_priv {
        u32             continue_diff_count;
        bool            bswitch_fsync;
        u8              framesync;
-       u8              frame_sync_monitor;
-
        u32             reset_count;
 
        enum reset_type rst_progress;

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
index ed8b39d3c85625b2f31d514b1342fcf07462f00e..43e335ab0733e1ed56cac642f39c050bf642bb19 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
@@ -1826,7 +1826,6 @@ static void _rtl92e_dm_init_fsync(struct net_device *dev)
        priv->rtllib->fsync_firstdiff_ratethreshold = 100;
        priv->rtllib->fsync_seconddiff_ratethreshold = 200;
        priv->rtllib->fsync_state = Default_Fsync;
-       priv->frame_sync_monitor = 1;
 
        timer_setup(&priv->fsync_timer, _rtl92e_dm_fsync_timer_callback, 0);
 }
@@ -2053,12 +2052,10 @@ static void _rtl92e_dm_check_fsync(struct net_device *dev)
 
                        }
                }
-               if (priv->frame_sync_monitor) {
-                       if (reg_c38_State != RegC38_Fsync_AP_BCM) {
-                               rtl92e_writeb(dev, rOFDM0_RxDetector3, 0x95);
+               if (reg_c38_State != RegC38_Fsync_AP_BCM) {
+                       rtl92e_writeb(dev, rOFDM0_RxDetector3, 0x95);
 
-                               reg_c38_State = RegC38_Fsync_AP_BCM;
-                       }
+                       reg_c38_State = RegC38_Fsync_AP_BCM;
                }
        } else {
                switch (priv->rtllib->fsync_state) {
@@ -2075,50 +2072,40 @@ static void _rtl92e_dm_check_fsync(struct net_device *dev)
                        break;
                }
 
-               if (priv->frame_sync_monitor) {
-                       if (priv->rtllib->state == RTLLIB_LINKED) {
-                               if (priv->undecorated_smoothed_pwdb <=
-                                   RegC38_TH) {
-                                       if (reg_c38_State !=
-                                           RegC38_NonFsync_Other_AP) {
-                                               rtl92e_writeb(dev,
-                                                             rOFDM0_RxDetector3,
-                                                             0x90);
-
-                                               reg_c38_State =
-                                                    RegC38_NonFsync_Other_AP;
-                                       }
-                               } else if (priv->undecorated_smoothed_pwdb >=
-                                          (RegC38_TH+5)) {
-                                       if (reg_c38_State) {
-                                               rtl92e_writeb(dev,
-                                                       rOFDM0_RxDetector3,
-                                                       priv->framesync);
-                                               reg_c38_State = RegC38_Default;
-                                       }
+               if (priv->rtllib->state == RTLLIB_LINKED) {
+                       if (priv->undecorated_smoothed_pwdb <=
+                           RegC38_TH) {
+                               if (reg_c38_State !=
+                                   RegC38_NonFsync_Other_AP) {
+                                       rtl92e_writeb(dev,
+                                                     rOFDM0_RxDetector3,
+                                                     0x90);
+
+                                       reg_c38_State =
+                                            RegC38_NonFsync_Other_AP;
                                }
-                       } else {
+                       } else if (priv->undecorated_smoothed_pwdb >=
+                                  (RegC38_TH+5)) {
                                if (reg_c38_State) {
-                                       rtl92e_writeb(dev, rOFDM0_RxDetector3,
-                                                     priv->framesync);
+                                       rtl92e_writeb(dev,
+                                               rOFDM0_RxDetector3,
+                                               priv->framesync);
                                        reg_c38_State = RegC38_Default;
                                }
                        }
+               } else {
+                       if (reg_c38_State) {
+                               rtl92e_writeb(dev, rOFDM0_RxDetector3,
+                                             priv->framesync);
+                               reg_c38_State = RegC38_Default;
+                       }
                }
        }
-       if (priv->frame_sync_monitor) {
-               if (priv->reset_count != reset_cnt) {
-                       rtl92e_writeb(dev, rOFDM0_RxDetector3,
-                                      priv->framesync);
-                       reg_c38_State = RegC38_Default;
-                       reset_cnt = priv->reset_count;
-               }
-       } else {
-               if (reg_c38_State) {
-                       rtl92e_writeb(dev, rOFDM0_RxDetector3,
-                                      priv->framesync);
-                       reg_c38_State = RegC38_Default;
-               }
+       if (priv->reset_count != reset_cnt) {
+               rtl92e_writeb(dev, rOFDM0_RxDetector3,
+                              priv->framesync);
+               reg_c38_State = RegC38_Default;
+               reset_cnt = priv->reset_count;
        }
 }