lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: rtl8192e: Convert typedef rt_firmware to struct rt_firmware

Browse Source 
Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger
2011-07-18 23:10:50 -05:00
parent b25765ce99
commit 5aca114d91
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/rtl8192e/r8192E_cmdpkt.c
View File

@@ -45,7 +45,7 @@
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
u16 frag_threshold; u16 frag_threshold;
u16 frag_length = 0, frag_offset = 0; u16 frag_length = 0, frag_offset = 0;
rt_firmware *pfirmware = priv->pFirmware; struct rt_firmware *pfirmware = priv->pFirmware;
struct sk_buff *skb; struct sk_buff *skb;
unsigned char *seg_ptr; unsigned char *seg_ptr;
cb_desc *tcb_desc; cb_desc *tcb_desc;

8
drivers/staging/rtl8192e/r8192E_firmware.c
View File

@@ -26,7 +26,7 @@
extern void firmware_init_param(struct net_device *dev) extern void firmware_init_param(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
rt_firmware *pfirmware = priv->pFirmware; struct rt_firmware *pfirmware = priv->pFirmware;
pfirmware->cmdpacket_frag_thresold = GET_COMMAND_PACKET_FRAG_THRESHOLD(MAX_TRANSMIT_BUFFER_SIZE); pfirmware->cmdpacket_frag_thresold = GET_COMMAND_PACKET_FRAG_THRESHOLD(MAX_TRANSMIT_BUFFER_SIZE);
} }
@@ -39,7 +39,7 @@ bool fw_download_code(struct net_device *dev, u8 *code_virtual_address, u32 buff
u16 frag_length, frag_offset = 0; u16 frag_length, frag_offset = 0;
int i; int i;
rt_firmware *pfirmware = priv->pFirmware; struct rt_firmware *pfirmware = priv->pFirmware;
struct sk_buff *skb; struct sk_buff *skb;
unsigned char *seg_ptr; unsigned char *seg_ptr;
cb_desc *tcb_desc; cb_desc *tcb_desc;
@@ -210,7 +210,7 @@ CPUCheckFirmwareReady_Fail:
inline static bool firmware_check_ready(struct net_device *dev, u8 load_fw_status) inline static bool firmware_check_ready(struct net_device *dev, u8 load_fw_status)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
rt_firmware *pfirmware = priv->pFirmware; struct rt_firmware *pfirmware = priv->pFirmware;
bool rt_status = true; bool rt_status = true;
switch (load_fw_status) { switch (load_fw_status) {
@@ -269,7 +269,7 @@ bool init_firmware(struct net_device *dev)
opt_rst_type_e rst_opt = OPT_SYSTEM_RESET; opt_rst_type_e rst_opt = OPT_SYSTEM_RESET;
firmware_init_step_e starting_state = FW_INIT_STEP0_BOOT; firmware_init_step_e starting_state = FW_INIT_STEP0_BOOT;
rt_firmware *pfirmware = priv->pFirmware; struct rt_firmware *pfirmware = priv->pFirmware;
RT_TRACE(COMP_FIRMWARE, " PlatformInitFirmware()==>\n"); RT_TRACE(COMP_FIRMWARE, " PlatformInitFirmware()==>\n");

4
drivers/staging/rtl8192e/r8192E_firmware.h
View File

@@ -58,14 +58,14 @@ struct fw_seg_container {
u8 *seg_ptr; u8 *seg_ptr;
};//, *pfw_seg_container; };//, *pfw_seg_container;
typedef struct _rt_firmware{ struct rt_firmware {
firmware_status_e firmware_status; firmware_status_e firmware_status;
u16 cmdpacket_frag_thresold; u16 cmdpacket_frag_thresold;
#define RTL8190_MAX_FIRMWARE_CODE_SIZE 64000 #define RTL8190_MAX_FIRMWARE_CODE_SIZE 64000
#define MAX_FW_INIT_STEP 3 #define MAX_FW_INIT_STEP 3
u8 firmware_buf[MAX_FW_INIT_STEP][RTL8190_MAX_FIRMWARE_CODE_SIZE]; u8 firmware_buf[MAX_FW_INIT_STEP][RTL8190_MAX_FIRMWARE_CODE_SIZE];
u16 firmware_buf_size[MAX_FW_INIT_STEP]; u16 firmware_buf_size[MAX_FW_INIT_STEP];
} rt_firmware, *prt_firmware; };
bool init_firmware(struct net_device *dev); bool init_firmware(struct net_device *dev);
extern void firmware_init_param(struct net_device *dev); extern void firmware_init_param(struct net_device *dev);

4
drivers/staging/rtl8192e/rtl_core.c
View File

@@ -1267,9 +1267,9 @@ static void rtl8192_init_priv_variable(struct net_device* dev)
priv->card_type = PCI; priv->card_type = PCI;
priv->AcmControl = 0; priv->AcmControl = 0;
priv->pFirmware = (rt_firmware*)vmalloc(sizeof(rt_firmware)); priv->pFirmware = (struct rt_firmware *)vmalloc(sizeof(struct rt_firmware));
if (priv->pFirmware) if (priv->pFirmware)
memset(priv->pFirmware, 0, sizeof(rt_firmware)); memset(priv->pFirmware, 0, sizeof(struct rt_firmware));
skb_queue_head_init(&priv->rx_queue); skb_queue_head_init(&priv->rx_queue);
skb_queue_head_init(&priv->skb_queue); skb_queue_head_init(&priv->skb_queue);

2
drivers/staging/rtl8192e/rtl_core.h
View File

@@ -606,7 +606,7 @@ typedef struct r8192_priv
ACM_METHOD AcmMethod; ACM_METHOD AcmMethod;
prt_firmware pFirmware; struct rt_firmware *pFirmware;
rtl819x_loopback_e LoopbackMode; rtl819x_loopback_e LoopbackMode;
firmware_source_e firmware_source; firmware_source_e firmware_source;