summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Finger <Larry.Finger@lwfinger.net>2011-07-18 23:10:50 -0500
committerLarry Finger <Larry.Finger@lwfinger.net>2011-08-24 01:37:28 -0500
commit5aca114d91e726db89d28e56f260b811cc76a3dd (patch)
tree767815219fcdfb33ac9b599102e0800e77a4b227
parentb25765ce99920834b11498b9f5adf3bfe2007a08 (diff)
downloadop-kernel-dev-5aca114d91e726db89d28e56f260b811cc76a3dd.zip
op-kernel-dev-5aca114d91e726db89d28e56f260b811cc76a3dd.tar.gz
staging: rtl8192e: Convert typedef rt_firmware to struct rt_firmware
Remove typedef from struct. Rename struct. Rename uses. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
-rw-r--r--drivers/staging/rtl8192e/r8192E_cmdpkt.c2
-rw-r--r--drivers/staging/rtl8192e/r8192E_firmware.c8
-rw-r--r--drivers/staging/rtl8192e/r8192E_firmware.h4
-rw-r--r--drivers/staging/rtl8192e/rtl_core.c4
-rw-r--r--drivers/staging/rtl8192e/rtl_core.h2
5 files changed, 10 insertions, 10 deletions
diff --git a/drivers/staging/rtl8192e/r8192E_cmdpkt.c b/drivers/staging/rtl8192e/r8192E_cmdpkt.c
index 6782f32..aa15255 100644
--- a/drivers/staging/rtl8192e/r8192E_cmdpkt.c
+++ b/drivers/staging/rtl8192e/r8192E_cmdpkt.c
@@ -45,7 +45,7 @@
struct r8192_priv *priv = rtllib_priv(dev);
u16 frag_threshold;
u16 frag_length = 0, frag_offset = 0;
- rt_firmware *pfirmware = priv->pFirmware;
+ struct rt_firmware *pfirmware = priv->pFirmware;
struct sk_buff *skb;
unsigned char *seg_ptr;
cb_desc *tcb_desc;
diff --git a/drivers/staging/rtl8192e/r8192E_firmware.c b/drivers/staging/rtl8192e/r8192E_firmware.c
index f7d1917..574d8dc 100644
--- a/drivers/staging/rtl8192e/r8192E_firmware.c
+++ b/drivers/staging/rtl8192e/r8192E_firmware.c
@@ -26,7 +26,7 @@
extern void firmware_init_param(struct net_device *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);
}
@@ -39,7 +39,7 @@ bool fw_download_code(struct net_device *dev, u8 *code_virtual_address, u32 buff
u16 frag_length, frag_offset = 0;
int i;
- rt_firmware *pfirmware = priv->pFirmware;
+ struct rt_firmware *pfirmware = priv->pFirmware;
struct sk_buff *skb;
unsigned char *seg_ptr;
cb_desc *tcb_desc;
@@ -210,7 +210,7 @@ CPUCheckFirmwareReady_Fail:
inline static bool firmware_check_ready(struct net_device *dev, u8 load_fw_status)
{
struct r8192_priv *priv = rtllib_priv(dev);
- rt_firmware *pfirmware = priv->pFirmware;
+ struct rt_firmware *pfirmware = priv->pFirmware;
bool rt_status = true;
switch (load_fw_status) {
@@ -269,7 +269,7 @@ bool init_firmware(struct net_device *dev)
opt_rst_type_e rst_opt = OPT_SYSTEM_RESET;
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");
diff --git a/drivers/staging/rtl8192e/r8192E_firmware.h b/drivers/staging/rtl8192e/r8192E_firmware.h
index 6fd1419..cb34b2b 100644
--- a/drivers/staging/rtl8192e/r8192E_firmware.h
+++ b/drivers/staging/rtl8192e/r8192E_firmware.h
@@ -58,14 +58,14 @@ struct fw_seg_container {
u8 *seg_ptr;
};//, *pfw_seg_container;
-typedef struct _rt_firmware{
+struct rt_firmware {
firmware_status_e firmware_status;
u16 cmdpacket_frag_thresold;
#define RTL8190_MAX_FIRMWARE_CODE_SIZE 64000
#define MAX_FW_INIT_STEP 3
u8 firmware_buf[MAX_FW_INIT_STEP][RTL8190_MAX_FIRMWARE_CODE_SIZE];
u16 firmware_buf_size[MAX_FW_INIT_STEP];
-} rt_firmware, *prt_firmware;
+};
bool init_firmware(struct net_device *dev);
extern void firmware_init_param(struct net_device *dev);
diff --git a/drivers/staging/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl_core.c
index 321b685..5fe3e8e 100644
--- a/drivers/staging/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl_core.c
@@ -1267,9 +1267,9 @@ static void rtl8192_init_priv_variable(struct net_device* dev)
priv->card_type = PCI;
priv->AcmControl = 0;
- priv->pFirmware = (rt_firmware*)vmalloc(sizeof(rt_firmware));
+ priv->pFirmware = (struct rt_firmware *)vmalloc(sizeof(struct rt_firmware));
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->skb_queue);
diff --git a/drivers/staging/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl_core.h
index 9dc1249..720d1af 100644
--- a/drivers/staging/rtl8192e/rtl_core.h
+++ b/drivers/staging/rtl8192e/rtl_core.h
@@ -606,7 +606,7 @@ typedef struct r8192_priv
ACM_METHOD AcmMethod;
- prt_firmware pFirmware;
+ struct rt_firmware *pFirmware;
rtl819x_loopback_e LoopbackMode;
firmware_source_e firmware_source;
OpenPOWER on IntegriCloud