From 428bd7df5dbaeb704268cc22e065712166e8bedd Mon Sep 17 00:00:00 2001 From: Ana Rey Date: Mon, 10 Mar 2014 19:10:24 +0100 Subject: staging: rtl8187se: Convert _RT_PS_MODE typedef into an enum The Documentation/CodingStyle doesn't recommend the use of typedef, convert this into an enum. While at it, I have also renamed the variable names that were used in this typedef not to use Hungarian notation. Signed-off-by: Ana Rey Signed-off-by: Peter P Waskiewicz Jr --- drivers/staging/rtl8187se/r8180.h | 12 ++++++------ drivers/staging/rtl8187se/r8180_core.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/staging/rtl8187se/r8180.h b/drivers/staging/rtl8187se/r8180.h index 5ea57b566fce..4f397f62f918 100644 --- a/drivers/staging/rtl8187se/r8180.h +++ b/drivers/staging/rtl8187se/r8180.h @@ -289,11 +289,11 @@ enum _ReasonCode { dest_not_QSTA = 0x32, /* 50 */ }; -typedef enum _RT_PS_MODE { - eActive, /* Active/Continuous access. */ - eMaxPs, /* Max power save mode. */ - eFastPs /* Fast power save mode. */ -} RT_PS_MODE; +enum rt_ps_mode { + ACTIVE, /* Active/Continuous access. */ + MAX_PS, /* Max power save mode. */ + FAST_PS /* Fast power save mode. */ +}; /* by amy for power save. */ struct r8180_priv { @@ -462,7 +462,7 @@ struct r8180_priv { bool SetRFPowerStateInProgress; u8 RFProgType; bool bLeisurePs; - RT_PS_MODE dot11PowerSaveMode; + enum rt_ps_mode dot11PowerSaveMode; /* u32 NumRxOkInPeriod;*/ /* YJ,del,080828 */ /* u32 NumTxOkInPeriod;*/ /* YJ,del,080828 */ u8 TxPollingTimes; diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c index 06f439d5f501..7938ad8d4957 100644 --- a/drivers/staging/rtl8187se/r8180_core.c +++ b/drivers/staging/rtl8187se/r8180_core.c @@ -2444,7 +2444,7 @@ static short rtl8180_init(struct net_device *dev) priv->led_strategy = SW_LED_MODE0; priv->TxPollingTimes = 0; /* lzm add 080826 */ priv->bLeisurePs = true; - priv->dot11PowerSaveMode = eActive; + priv->dot11PowerSaveMode = ACTIVE; priv->AdMinCheckPeriod = 5; priv->AdMaxCheckPeriod = 10; priv->AdMaxRxSsThreshold = 30; /* 60->30 */ @@ -2869,7 +2869,7 @@ static struct net_device_stats *rtl8180_stats(struct net_device *dev) * Change current and default preamble mode. */ static bool MgntActSet_802_11_PowerSaveMode(struct r8180_priv *priv, - RT_PS_MODE rtPsMode) + enum rt_ps_mode rtPsMode) { /* Currently, we do not change power save mode on IBSS mode. */ if (priv->ieee80211->iw_mode == IW_MODE_ADHOC) -- cgit v1.2.3