diff options
| author | Larry Finger <Larry.Finger@lwfinger.net> | 2011-07-19 19:49:51 -0500 |
|---|---|---|
| committer | Larry Finger <Larry.Finger@lwfinger.net> | 2011-08-24 10:52:36 -0500 |
| commit | ab0d7ccaf733d064bd8e0f1d1a0eb67be79232ee (patch) | |
| tree | ebd52a2594481f412b69e541b7ce8311479c44a9 | |
| parent | ed8eac2f92932cf8e02f98950224c673eceb9b4f (diff) | |
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>
| -rw-r--r-- | drivers/staging/rtl8192e/rtl_core.c | 12 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtl_core.h | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/drivers/staging/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl_core.c index ce649a560a37..3066fc80f664 100644 --- 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 d8bd81875541..b3bba7dae205 100644 --- 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; |