staging: rtl8192e: Prepare header files to ease use of typedef enum conversion

The tool that I am using fails for certain conditions. This patch makes trivial
changes to the source to allow the tool to work for all cases.

I also remove some artifacts left from the typedef struct conversion.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

1 files changed, 28 insertions, 27 deletions

diff --git a/drivers/staging/rtl8192e/rtl_dm.h b/drivers/staging/rtl8192e/rtl_dm.h
index a9aa09f13f51..219e4af2b3d3 100644
--- a/drivers/staging/rtl8192e/rtl_dm.h
+++ b/drivers/staging/rtl8192e/rtl_dm.h
@@ -125,25 +125,25 @@ struct dig_t {
 	bool		initialgain_lowerbound_state;
 
 	long		rssi_val;
-};//;
+};
 
-typedef enum tag_dynamic_init_gain_state_definition
+typedef enum _dm_dig_sta_e
 {
 	DM_STA_DIG_OFF = 0,
 	DM_STA_DIG_ON,
 	DM_STA_DIG_MAX
-}dm_dig_sta_e;
+} dm_dig_sta_e;
 
 
-typedef enum tag_dynamic_ratr_state_definition
+typedef enum _dm_ratr_sta_e
 {
 	DM_RATR_STA_HIGH = 0,
 	DM_RATR_STA_MIDDLE = 1,
 	DM_RATR_STA_LOW = 2,
 	DM_RATR_STA_MAX
-}dm_ratr_sta_e;
+} dm_ratr_sta_e;
 
-typedef enum tag_dynamic_init_gain_operation_type_definition
+typedef enum _dm_dig_op_e
 {
 	DIG_TYPE_THRESH_HIGH	= 0,
 	DIG_TYPE_THRESH_LOW	= 1,
@@ -159,41 +159,41 @@ typedef enum tag_dynamic_init_gain_operation_type_definition
 	DIG_TYPE_ENABLE			= 20,
 	DIG_TYPE_DISABLE		= 30,
 	DIG_OP_TYPE_MAX
-}dm_dig_op_e;
+} dm_dig_op_e;
 
-typedef enum tag_dig_algorithm_definition
+typedef enum _dm_dig_alg_e
 {
 	DIG_ALGO_BY_FALSE_ALARM = 0,
 	DIG_ALGO_BY_RSSI	= 1,
 	DIG_ALGO_BEFORE_CONNECT_BY_RSSI_AND_ALARM = 2,
 	DIG_ALGO_BY_TOW_PORT = 3,
 	DIG_ALGO_MAX
-}dm_dig_alg_e;
+} dm_dig_alg_e;
 
-typedef enum tag_DIG_TWO_PORT_ALGO_Definition
+typedef enum _DM_DIG_TWO_PORT_ALG_E
 {
 	DIG_TWO_PORT_ALGO_RSSI = 0,
 	DIG_TWO_PORT_ALGO_FALSE_ALARM = 1,
-}DM_DIG_TWO_PORT_ALG_E;
+} DM_DIG_TWO_PORT_ALG_E;
 
 
-typedef enum tag_DIG_EXT_PORT_ALGO_Definition
+typedef enum _DM_DIG_EXT_PORT_ALG_E
 {
 	DIG_EXT_PORT_STAGE_0 = 0,
 	DIG_EXT_PORT_STAGE_1 = 1,
 	DIG_EXT_PORT_STAGE_2 = 2,
 	DIG_EXT_PORT_STAGE_3 = 3,
 	DIG_EXT_PORT_STAGE_MAX = 4,
-}DM_DIG_EXT_PORT_ALG_E;
+} DM_DIG_EXT_PORT_ALG_E;
 
-typedef enum tag_dig_dbgmode_definition
+typedef enum _dm_dig_dbg_e
 {
 	DIG_DBG_OFF = 0,
 	DIG_DBG_ON = 1,
 	DIG_DBG_MAX
-}dm_dig_dbg_e;
+} dm_dig_dbg_e;
 
-typedef enum tag_dig_connect_definition
+typedef enum _dm_dig_connect_e
 {
 	DIG_STA_DISCONNECT = 0,
 	DIG_STA_CONNECT = 1,
@@ -202,22 +202,23 @@ typedef enum tag_dig_connect_definition
 	DIG_AP_CONNECT = 4,
 	DIG_AP_ADD_STATION = 5,
 	DIG_CONNECT_MAX
-}dm_dig_connect_e;
+} dm_dig_connect_e;
 
-typedef enum tag_dig_packetdetection_threshold_definition
+typedef enum _dm_dig_pd_th_e
 {
 	DIG_PD_AT_LOW_POWER = 0,
 	DIG_PD_AT_NORMAL_POWER = 1,
 	DIG_PD_AT_HIGH_POWER = 2,
 	DIG_PD_MAX
-}dm_dig_pd_th_e;
+} dm_dig_pd_th_e;
 
-typedef enum tag_dig_cck_cs_ratio_state_definition
+typedef enum _dm_dig_cs_ratio_e
 {
 	DIG_CS_RATIO_LOWER = 0,
 	DIG_CS_RATIO_HIGHER = 1,
 	DIG_CS_MAX
-}dm_dig_cs_ratio_e;
+} dm_dig_cs_ratio_e;
+
 struct drx_path_sel {
 	u8		Enable;
 	u8		DbgMode;
@@ -232,28 +233,28 @@ struct drx_path_sel {
 	u8		rf_rssi[4];
 	u8		rf_enable_rssi_th[4];
 	long		cck_pwdb_sta[4];
-};//;
+};
 
-typedef enum tag_CCK_Rx_Path_Method_Definition
+typedef enum _DM_CCK_Rx_Path_Method
 {
 	CCK_Rx_Version_1 = 0,
 	CCK_Rx_Version_2= 1,
 	CCK_Rx_Version_MAX
-}DM_CCK_Rx_Path_Method;
+} DM_CCK_Rx_Path_Method;
 
 
-typedef enum tag_DM_DbgMode_Definition
+typedef enum _DM_DBG_E
 {
 	DM_DBG_OFF = 0,
 	DM_DBG_ON = 1,
 	DM_DBG_MAX
-}DM_DBG_E;
+} DM_DBG_E;
 
 struct dcmd_txcmd {
 	u32	Op;
 	u32	Length;
 	u32	Value;
-};//, *struct dcmd_txcmd *;
+};
 /*------------------------------Define structure----------------------------*/