[PATCH 08/10] staging:rtl8192u: Refactor enum dm_dig_pd_th_e - Style

From: John Whitmore
Date: Fri Jul 27 2018 - 19:28:51 EST


The enumerated type dm_dig_pd_th_e is never actually used as
the type for the two variables which use the constants, which the
enumeration defines. This omission removes the possibility of taking
advantage of compiler type checking.

To correct this the two member variables, (curpd_thstate & prepd_thstate)
have been changed to use the type enum dm_dig_pd_th_e rather then u8.

Additionally the enum's declaration has been moved above the dig
structure, where the type is used, the 'typedef' has been removed to
clear the checkpatch issue with defining new types, and the value
'DIG_PD_MAX' has been removed from the enumeration, since it is never
used in code.

Signed-off-by: John Whitmore <johnfwhitmore@xxxxxxxxx>
---
drivers/staging/rtl8192u/r8192U_dm.h | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/rtl8192u/r8192U_dm.h b/drivers/staging/rtl8192u/r8192U_dm.h
index 825df06e17a8..41b08211e958 100644
--- a/drivers/staging/rtl8192u/r8192U_dm.h
+++ b/drivers/staging/rtl8192u/r8192U_dm.h
@@ -81,6 +81,12 @@ enum dm_dig_connect_e {
DIG_CONNECT = 1,
};

+enum dm_dig_pd_th_e {
+ DIG_PD_AT_LOW_POWER = 0,
+ DIG_PD_AT_NORMAL_POWER = 1,
+ DIG_PD_AT_HIGH_POWER = 2,
+};
+
/* 2007/10/04 MH Define upper and lower threshold of DIG enable or disable. */
struct dig {
u8 dig_enable_flag;
@@ -99,8 +105,8 @@ struct dig {
enum dm_dig_connect_e cur_connect_state;
enum dm_dig_connect_e pre_connect_state;

- u8 curpd_thstate;
- u8 prepd_thstate;
+ enum dm_dig_pd_th_e curpd_thstate;
+ enum dm_dig_pd_th_e prepd_thstate;
u8 curcs_ratio_state;
u8 precs_ratio_state;

@@ -115,13 +121,6 @@ struct dig {
long rssi_val;
};

-typedef enum tag_dig_packetdetection_threshold_definition {
- 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;
-
typedef enum tag_dig_cck_cs_ratio_state_definition {
DIG_CS_RATIO_LOWER = 0,
DIG_CS_RATIO_HIGHER = 1,
--
2.18.0