From 4fd7cedc5135a7cc5df3c0d9348b1c32b33bdb96 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Tue, 19 Jul 2011 20:47:28 -0500 Subject: [PATCH] staging: rtl8192e: Convert typedef LED_CTL_MODE to enum led_ctl_mode Remove typedef from enum. Rename enum. Rename uses. Signed-off-by: Larry Finger --- drivers/staging/rtl8192e/r8192E_dev.c | 4 ++-- drivers/staging/rtl8192e/rtllib.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/r8192E_dev.c index cb894b6d2e75..a3a269ba5d20 100644 --- a/drivers/staging/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/r8192E_dev.c @@ -61,7 +61,7 @@ void rtl8192e_update_msr(struct net_device *dev) { struct r8192_priv *priv = rtllib_priv(dev); u8 msr; - LED_CTL_MODE LedAction = LED_CTL_NO_LINK; + enum led_ctl_mode LedAction = LED_CTL_NO_LINK; msr = read_nic_byte(dev, MSR); msr &= ~ MSR_LINK_MASK; @@ -110,7 +110,7 @@ rtl8192e_SetHwReg(struct net_device *dev,u8 variable,u8* val) case HW_VAR_MEDIA_STATUS: { enum rt_op_mode OpMode = *((enum rt_op_mode *)(val)); - LED_CTL_MODE LedAction = LED_CTL_NO_LINK; + enum led_ctl_mode LedAction = LED_CTL_NO_LINK; u8 btMsr = read_nic_byte(dev, MSR); btMsr &= 0xfc; diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index a147d905f93e..9966be22a9e8 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -621,7 +621,7 @@ enum init_gain_op_type { IG_Max }; -typedef enum _LED_CTL_MODE{ +enum led_ctl_mode { LED_CTL_POWER_ON = 1, LED_CTL_LINK = 2, LED_CTL_NO_LINK = 3, @@ -635,7 +635,7 @@ typedef enum _LED_CTL_MODE{ LED_CTL_START_WPS_BOTTON = 11, LED_CTL_STOP_WPS_FAIL = 12, LED_CTL_STOP_WPS_FAIL_OVERLAP = 13, -} LED_CTL_MODE; +}; typedef enum _RT_RF_TYPE_DEF { @@ -2525,7 +2525,7 @@ struct rtllib_device { void (*UpdateInterruptMaskHandler)(struct net_device* dev, u32 AddMSR, u32 RemoveMSR); u16 (*rtl_11n_user_show_rates)(struct net_device *dev); void (*ScanOperationBackupHandler)(struct net_device *dev, u8 Operation); - void (*LedControlHandler)(struct net_device * dev, LED_CTL_MODE LedAction); + void (*LedControlHandler)(struct net_device * dev, enum led_ctl_mode LedAction); void (*SetHwRegHandler)(struct net_device *dev,u8 variable,u8* val); void (*GetHwRegHandler)(struct net_device *dev,u8 variable,u8* val); -- 2.20.1