Commit 8add1eb5 authored by John Whitmore's avatar John Whitmore Committed by Greg Kroah-Hartman

staging:rtl8192u: Remove debug member from structures - Style

Two structures, (struct dig and struct dynamic_rx_path_sel) contain
a u8 member variable representing debug setting. In the file r8192U_dm.c
these member variables, for both structures, are initialised to an
enumerated constant 'DM_DBG_OFF'. The member variables are never
assigned another value, other then off. Later in code the member
variables are tested to for equality to 'DM_DBG_OFF' and if that is the
case an assignment statement is executed.

Since the value of the variables is always off the test is redundant and
the conditional branch can just be executed without the test. Since the
member variables are then actually used both have been removed, along
with the enumerated type which defines debug status, on/off.

These are coding style changes to remove unused or redundant code, there
should be no impact on runtime code execution.
Signed-off-by: default avatarJohn Whitmore <johnfwhitmore@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5751e4f1
...@@ -1635,7 +1635,6 @@ static void dm_dig_init(struct net_device *dev) ...@@ -1635,7 +1635,6 @@ static void dm_dig_init(struct net_device *dev)
/* 2007/10/05 MH Disable DIG scheme now. Not tested. */ /* 2007/10/05 MH Disable DIG scheme now. Not tested. */
dm_digtable.dig_enable_flag = true; dm_digtable.dig_enable_flag = true;
dm_digtable.dig_algorithm = DIG_ALGO_BY_RSSI; dm_digtable.dig_algorithm = DIG_ALGO_BY_RSSI;
dm_digtable.dbg_mode = DM_DBG_OFF; /* off=by real rssi value, on=by DM_DigTable.Rssi_val for new dig */
dm_digtable.dig_algorithm_switch = 0; dm_digtable.dig_algorithm_switch = 0;
/* 2007/10/04 MH Define init gain threshold. */ /* 2007/10/04 MH Define init gain threshold. */
...@@ -1720,8 +1719,7 @@ static void dm_ctrl_initgain_byrssi_by_driverrssi( ...@@ -1720,8 +1719,7 @@ static void dm_ctrl_initgain_byrssi_by_driverrssi(
/*DbgPrint("DM_DigTable.PreConnectState = %d, DM_DigTable.CurConnectState = %d\n", /*DbgPrint("DM_DigTable.PreConnectState = %d, DM_DigTable.CurConnectState = %d\n",
DM_DigTable.PreConnectState, DM_DigTable.CurConnectState);*/ DM_DigTable.PreConnectState, DM_DigTable.CurConnectState);*/
if (dm_digtable.dbg_mode == DM_DBG_OFF) dm_digtable.rssi_val = priv->undecorated_smoothed_pwdb;
dm_digtable.rssi_val = priv->undecorated_smoothed_pwdb;
/*DbgPrint("DM_DigTable.Rssi_val = %d\n", DM_DigTable.Rssi_val);*/ /*DbgPrint("DM_DigTable.Rssi_val = %d\n", DM_DigTable.Rssi_val);*/
dm_initial_gain(dev); dm_initial_gain(dev);
dm_pd_th(dev); dm_pd_th(dev);
...@@ -2398,7 +2396,6 @@ static void dm_init_rxpath_selection(struct net_device *dev) ...@@ -2398,7 +2396,6 @@ static void dm_init_rxpath_selection(struct net_device *dev)
DM_RxPathSelTable.cck_method = CCK_Rx_Version_2; DM_RxPathSelTable.cck_method = CCK_Rx_Version_2;
else else
DM_RxPathSelTable.cck_method = CCK_Rx_Version_1; DM_RxPathSelTable.cck_method = CCK_Rx_Version_1;
DM_RxPathSelTable.DbgMode = DM_DBG_OFF;
DM_RxPathSelTable.disabledRF = 0; DM_RxPathSelTable.disabledRF = 0;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
DM_RxPathSelTable.rf_rssi[i] = 50; DM_RxPathSelTable.rf_rssi[i] = 50;
...@@ -2440,8 +2437,7 @@ static void dm_rxpath_sel_byrssi(struct net_device *dev) ...@@ -2440,8 +2437,7 @@ static void dm_rxpath_sel_byrssi(struct net_device *dev)
/* decide max/sec/min rssi index */ /* decide max/sec/min rssi index */
for (i = 0; i < RF90_PATH_MAX; i++) { for (i = 0; i < RF90_PATH_MAX; i++) {
if (!DM_RxPathSelTable.DbgMode) DM_RxPathSelTable.rf_rssi[i] = priv->stats.rx_rssi_percentage[i];
DM_RxPathSelTable.rf_rssi[i] = priv->stats.rx_rssi_percentage[i];
if (priv->brfpath_rxenable[i]) { if (priv->brfpath_rxenable[i]) {
rf_num++; rf_num++;
......
...@@ -96,7 +96,6 @@ enum dig_cck_cs_ratio_state { ...@@ -96,7 +96,6 @@ enum dig_cck_cs_ratio_state {
struct dig { struct dig {
u8 dig_enable_flag; u8 dig_enable_flag;
enum dig_algorithm dig_algorithm; enum dig_algorithm dig_algorithm;
u8 dbg_mode;
u8 dig_algorithm_switch; u8 dig_algorithm_switch;
long rssi_low_thresh; long rssi_low_thresh;
...@@ -133,7 +132,6 @@ enum cck_rx_path_method { ...@@ -133,7 +132,6 @@ enum cck_rx_path_method {
struct dynamic_rx_path_sel { struct dynamic_rx_path_sel {
u8 Enable; u8 Enable;
u8 DbgMode;
enum cck_rx_path_method cck_method; enum cck_rx_path_method cck_method;
u8 cck_Rx_path; u8 cck_Rx_path;
...@@ -147,12 +145,6 @@ struct dynamic_rx_path_sel { ...@@ -147,12 +145,6 @@ struct dynamic_rx_path_sel {
long cck_pwdb_sta[4]; long cck_pwdb_sta[4];
}; };
typedef enum tag_DM_DbgMode_Definition {
DM_DBG_OFF = 0,
DM_DBG_ON = 1,
DM_DBG_MAX
} DM_DBG_E;
typedef struct tag_Tx_Config_Cmd_Format { typedef struct tag_Tx_Config_Cmd_Format {
u32 Op; /* Command packet type. */ u32 Op; /* Command packet type. */
u32 Length; /* Command packet length. */ u32 Length; /* Command packet length. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment