Commit ab0d7cca authored by Larry Finger's avatar Larry Finger
Browse files

staging: rtl8192e: Convert typedef RESET_TYPE to enum reset_type 



Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
parent ed8eac2f

drivers/staging/rtl8192e/rtl_core.c

+6 −6
Original line number Diff line number Diff line
@@ -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));

drivers/staging/rtl8192e/rtl_core.h

+3 −3
Original line number Diff line number Diff line
@@ -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;