staging: rtl8192e: Convert typedef RESET_TYPE to enum reset_type

Remove typedef from enum.
Rename enum.
Rename uses.

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

diff --git a/drivers/staging/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl_core.c
index ce649a560a37a2db19a9360321f32fd240507bd4..3066fc80f664336404dd4787c54a62b9b45aff64 100644 (file)
--- a/drivers/staging/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl_core.c
@@ -1416,7 +1416,7 @@ short rtl8192_is_tx_queue_empty(struct net_device *dev)
        return 1;
 }
 
-RESET_TYPE
+enum reset_type
 rtl819x_TxCheckStuck(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
@@ -1476,7 +1476,7 @@ rtl819x_TxCheckStuck(struct net_device *dev)
        return RESET_TYPE_NORESET;
 }
 
-RESET_TYPE rtl819x_RxCheckStuck(struct net_device *dev)
+enum reset_type rtl819x_RxCheckStuck(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
 
@@ -1489,12 +1489,12 @@ RESET_TYPE rtl819x_RxCheckStuck(struct net_device *dev)
        return RESET_TYPE_NORESET;
 }
 
-RESET_TYPE
+enum reset_type
 rtl819x_ifcheck_resetornot(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
-       RESET_TYPE      TxResetType = RESET_TYPE_NORESET;
-       RESET_TYPE      RxResetType = RESET_TYPE_NORESET;
+       enum reset_type TxResetType = RESET_TYPE_NORESET;
+       enum reset_type RxResetType = RESET_TYPE_NORESET;
        RT_RF_POWER_STATE       rfState;
 
        rfState = priv->rtllib->eRFPowerState;
@@ -1678,7 +1678,7 @@ void      rtl819x_watchdog_wqcallback(void *data)
        struct r8192_priv *priv = container_of_dwork_rsl(data, struct r8192_priv, watch_dog_wq);
        struct net_device *dev = priv->rtllib->dev;
        struct rtllib_device* ieee = priv->rtllib;
-       RESET_TYPE      ResetType = RESET_TYPE_NORESET;
+       enum reset_type ResetType = RESET_TYPE_NORESET;
        static u8       check_reset_cnt = 0;
        unsigned long flags;
        struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)(&(priv->rtllib->PowerSaveControl));

diff --git a/drivers/staging/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl_core.h
index d8bd81875541ebb3a5383f343a63a20245b89faf..b3bba7dae2057b507dd0660e9fb1f9e35567ef5a 100644 (file)
--- a/drivers/staging/rtl8192e/rtl_core.h
+++ b/drivers/staging/rtl8192e/rtl_core.h
@@ -322,11 +322,11 @@ enum rt_customer_id {
        RT_CID_819x_WNC_COREGA = 31,
 };
 
-typedef enum _RESET_TYPE {
+enum reset_type {
        RESET_TYPE_NORESET = 0x00,
        RESET_TYPE_NORMAL = 0x01,
        RESET_TYPE_SILENT = 0x02
-} RESET_TYPE;
+};
 
 typedef enum _IC_INFERIORITY_8192S{
        IC_INFERIORITY_A            = 0,
@@ -978,7 +978,7 @@ struct r8192_priv {
        u32             ccktxpower_adjustcnt_not_ch14;
        u32             ccktxpower_adjustcnt_ch14;
 
-       RESET_TYPE      ResetProgress;
+       enum reset_type ResetProgress;
        bool            bForcedSilentReset;
        bool            bDisableNormalResetCheck;
        u16             TxCounter;