From e93e0f6aabd51652fcfa943ca8e8ec2f4947156e Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Tue, 19 Jul 2011 20:24:49 -0500 Subject: [PATCH] staging: rtl8192e: Convert typedef RT_OP_MODE to enum rt_op_mode Remove typedef from enum. Rename enum. Rename uses. Signed-off-by: Larry Finger --- drivers/staging/rtl8192e/r8192E_dev.c | 2 +- drivers/staging/rtl8192e/rtllib.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/r8192E_dev.c index 0c06e7b84408..cb894b6d2e75 100644 --- a/drivers/staging/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/r8192E_dev.c @@ -109,7 +109,7 @@ rtl8192e_SetHwReg(struct net_device *dev,u8 variable,u8* val) case HW_VAR_MEDIA_STATUS: { - RT_OP_MODE OpMode = *((RT_OP_MODE *)(val)); + enum rt_op_mode OpMode = *((enum rt_op_mode *)(val)); LED_CTL_MODE LedAction = LED_CTL_NO_LINK; u8 btMsr = read_nic_byte(dev, MSR); diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index a27c58f203b6..8fc3056f369f 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -403,12 +403,12 @@ enum hw_variables { HW_VAR_RF_TIMING, }; -typedef enum _RT_OP_MODE{ +enum rt_op_mode { RT_OP_MODE_AP, RT_OP_MODE_INFRASTRUCTURE, RT_OP_MODE_IBSS, RT_OP_MODE_NO_LINK, -} RT_OP_MODE, *PRT_OP_MODE; +}; #define aSifsTime (((priv->rtllib->current_network.mode == IEEE_A)||(priv->rtllib->current_network.mode == IEEE_N_24G)||(priv->rtllib->current_network.mode == IEEE_N_5G))? 16 : 10) @@ -2099,7 +2099,7 @@ struct rtllib_device { u8 hwscan_sem_up; u8 CntAfterLink; - RT_OP_MODE OpMode; + enum rt_op_mode OpMode; u8 VersionID; /* The last AssocReq/Resp IEs */ -- 2.34.1