From: Larry Finger Date: Tue, 19 Jul 2011 18:13:24 +0000 (-0500) Subject: staging: rtl8192e: Convert typedef opt_rst_type_e to enum opt_rst_type X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=6bf04003c79665119b5bc14aef58e205d3567da1;p=deliverable%2Flinux.git staging: rtl8192e: Convert typedef opt_rst_type_e to enum opt_rst_type Remove typedef from enum. Rename enum. Rename uses. Signed-off-by: Larry Finger --- diff --git a/drivers/staging/rtl8192e/r8192E_firmware.c b/drivers/staging/rtl8192e/r8192E_firmware.c index 125d66e19144..d284d422b64a 100644 --- a/drivers/staging/rtl8192e/r8192E_firmware.c +++ b/drivers/staging/rtl8192e/r8192E_firmware.c @@ -266,7 +266,7 @@ bool init_firmware(struct net_device *dev) u32 file_length = 0; u8 *mapped_file = NULL; u8 init_step = 0; - opt_rst_type_e rst_opt = OPT_SYSTEM_RESET; + enum opt_rst_type rst_opt = OPT_SYSTEM_RESET; enum firmware_init_step starting_state = FW_INIT_STEP0_BOOT; struct rt_firmware *pfirmware = priv->pFirmware; diff --git a/drivers/staging/rtl8192e/r8192E_firmware.h b/drivers/staging/rtl8192e/r8192E_firmware.h index 52b1f342fdee..019a5a281f25 100644 --- a/drivers/staging/rtl8192e/r8192E_firmware.h +++ b/drivers/staging/rtl8192e/r8192E_firmware.h @@ -29,10 +29,10 @@ enum firmware_init_step { FW_INIT_STEP2_DATA = 2, }; -typedef enum _opt_rst_type_e{ +enum opt_rst_type { OPT_SYSTEM_RESET = 0, OPT_FIRMWARE_RESET = 1, -} opt_rst_type_e; +}; typedef enum _desc_packet_type_e{ DESC_PACKET_TYPE_INIT = 0,