[PATCH 02/10] staging:rtl8192u: Refactor use of enum dm_dig_sta_e - Style

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


Refactor the use of the enumerated type dm_dig_sta_e, which is not
actually used for type checking by the compiler.

The enumerated type defines values for the enumeration, which are used
by both dig_state and dig_highpwr_state, (members of the struct dig).
Both of those variables were defined as being of type u8. This negates
any usefulness of the use of the enumeration, (compiler type checking).

To make use of the compiler's type-checking the two member variables,
dig_state and dig_highpwr_state have been changed to being of type
enum dm_dig_sta_e. The enumerated type has been moved above the
struct dig definition so that the enumeration is already defined when
compiler reaches the two types using the enumerated type.

In addition the 'typedef' of the enumerated type has been removed to
clear the checkpatch issue with declaring new types.

These changes, whilst convoluted, are purely coding style in nature and
should not impact runtime code execution.

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

diff --git a/drivers/staging/rtl8192u/r8192U_dm.h b/drivers/staging/rtl8192u/r8192U_dm.h
index e86dda99c223..2444e1c1357b 100644
--- a/drivers/staging/rtl8192u/r8192U_dm.h
+++ b/drivers/staging/rtl8192u/r8192U_dm.h
@@ -64,6 +64,13 @@


/*------------------------------Define structure----------------------------*/
+
+enum dm_dig_sta_e {
+ DM_STA_DIG_OFF = 0,
+ DM_STA_DIG_ON,
+ DM_STA_DIG_MAX
+};
+
/* 2007/10/04 MH Define upper and lower threshold of DIG enable or disable. */
struct dig {
u8 dig_enable_flag;
@@ -77,8 +84,8 @@ struct dig {
long rssi_high_power_lowthresh;
long rssi_high_power_highthresh;

- u8 dig_state;
- u8 dig_highpwr_state;
+ enum dm_dig_sta_e dig_state;
+ enum dm_dig_sta_e dig_highpwr_state;
u8 cur_connect_state;
u8 pre_connect_state;

@@ -98,13 +105,6 @@ struct dig {
long rssi_val;
};

-typedef enum tag_dynamic_init_gain_state_definition {
- DM_STA_DIG_OFF = 0,
- DM_STA_DIG_ON,
- DM_STA_DIG_MAX
-} dm_dig_sta_e;
-
-
/* 2007/10/08 MH Define RATR state. */
typedef enum tag_dynamic_ratr_state_definition {
DM_RATR_STA_HIGH = 0,
--
2.18.0