staging: rtl8192e: Convert typedef TX_FWINFO_8190PCI to struct tx_fwinfo_8190pci

Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

diff --git a/drivers/staging/rtl8192e/r8190P_def.h b/drivers/staging/rtl8192e/r8190P_def.h
index fdd647a..4bb7123 100644 (file)
--- a/drivers/staging/rtl8192e/r8190P_def.h
+++ b/drivers/staging/rtl8192e/r8190P_def.h
@@ -207,7 +207,7 @@ struct tx_fwinfo {
        u32                     PacketID:13;
 };//;
 
-typedef struct _TX_FWINFO_8190PCI{
+struct tx_fwinfo_8190pci {
        u8                      TxRate:7;
        u8                      CtsEnable:1;
        u8                      RtsRate:7;
@@ -237,7 +237,7 @@ typedef struct _TX_FWINFO_8190PCI{
        u32                     PacketID:13;
 
 
-}TX_FWINFO_8190PCI, *PTX_FWINFO_8190PCI;
+};//, *struct tx_fwinfo_8190pci *;
 
 
 #define TX_DESC_SIZE                   32

diff --git a/drivers/staging/rtl8192e/r8192E_cmdpkt.c b/drivers/staging/rtl8192e/r8192E_cmdpkt.c
index de65f40..2ff69ef 100644 (file)
--- a/drivers/staging/rtl8192e/r8192E_cmdpkt.c
+++ b/drivers/staging/rtl8192e/r8192E_cmdpkt.c
@@ -51,7 +51,7 @@
        cb_desc                 *tcb_desc;
        u8                              bLastIniPkt;
 
-       PTX_FWINFO_8190PCI      pTxFwInfo = NULL;
+       struct tx_fwinfo_8190pci *pTxFwInfo = NULL;
 
        RT_TRACE(COMP_CMDPKT,"%s(),buffer_len is %d\n",__func__,buffer_len);
        firmware_init_param(dev);
@@ -82,8 +82,8 @@
                tcb_desc->pkt_size = frag_length;
 
                seg_ptr = skb_put(skb, priv->rtllib->tx_headroom);
-               pTxFwInfo = (PTX_FWINFO_8190PCI)seg_ptr;
-               memset(pTxFwInfo,0,sizeof(TX_FWINFO_8190PCI));
+               pTxFwInfo = (struct tx_fwinfo_8190pci *)seg_ptr;
+               memset(pTxFwInfo,0,sizeof(struct tx_fwinfo_8190pci));
                memset(pTxFwInfo,0x12,8);
 
                seg_ptr = skb_put(skb, frag_length);

diff --git a/drivers/staging/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/r8192E_dev.c
index d441a54..e41736b 100644 (file)
--- a/drivers/staging/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/r8192E_dev.c
@@ -1159,9 +1159,9 @@ void  rtl8192_tx_fill_desc(struct net_device* dev, tx_desc * pdesc, cb_desc * cb
 {
     struct r8192_priv *priv = rtllib_priv(dev);
     dma_addr_t mapping = pci_map_single(priv->pdev, skb->data, skb->len, PCI_DMA_TODEVICE);
-    TX_FWINFO_8190PCI *pTxFwInfo = NULL;
-    pTxFwInfo = (PTX_FWINFO_8190PCI)skb->data;
-    memset(pTxFwInfo,0,sizeof(TX_FWINFO_8190PCI));
+    struct tx_fwinfo_8190pci *pTxFwInfo = NULL;
+    pTxFwInfo = (struct tx_fwinfo_8190pci *)skb->data;
+    memset(pTxFwInfo,0,sizeof(struct tx_fwinfo_8190pci));
     pTxFwInfo->TxHT = (cb_desc->data_rate&0x80)?1:0;
     pTxFwInfo->TxRate = MRateToHwRate8190Pci((u8)cb_desc->data_rate);
     pTxFwInfo->EnableCPUDur = cb_desc->bTxEnableFwCalcDur;
@@ -1205,8 +1205,8 @@ void  rtl8192_tx_fill_desc(struct net_device* dev, tx_desc * pdesc, cb_desc * cb
     memset((u8*)pdesc,0,12);
     pdesc->LINIP = 0;
     pdesc->CmdInit = 1;
-    pdesc->Offset = sizeof(TX_FWINFO_8190PCI) + 8;
-    pdesc->PktSize = (u16)skb->len-sizeof(TX_FWINFO_8190PCI);
+    pdesc->Offset = sizeof(struct tx_fwinfo_8190pci) + 8;
+    pdesc->PktSize = (u16)skb->len-sizeof(struct tx_fwinfo_8190pci);
 
     pdesc->SecCAMID= 0;
     pdesc->RATid = cb_desc->RATRIndex;
@@ -1244,7 +1244,7 @@ void  rtl8192_tx_fill_desc(struct net_device* dev, tx_desc * pdesc, cb_desc * cb
     pdesc->PktId = 0x0;
 
     pdesc->QueueSelect = rtl8192_MapHwQueueToFirmwareQueue(cb_desc->queue_index, cb_desc->priority);
-    pdesc->TxFWInfoSize = sizeof(TX_FWINFO_8190PCI);
+    pdesc->TxFWInfoSize = sizeof(struct tx_fwinfo_8190pci);
 
     pdesc->DISFB = cb_desc->bTxDisableRateFallBack;
     pdesc->USERATE = cb_desc->bTxUseDriverAssingedRate;
@@ -1271,7 +1271,7 @@ void  rtl8192_tx_fill_cmd_desc(struct net_device* dev, tx_desc_cmd * entry,
     } else {
        tx_desc* entry_tmp = (tx_desc*)entry;
         entry_tmp->CmdInit = DESC_PACKET_TYPE_NORMAL;
-        entry_tmp->Offset = sizeof(TX_FWINFO_8190PCI) + 8;
+        entry_tmp->Offset = sizeof(struct tx_fwinfo_8190pci) + 8;
         entry_tmp->PktSize = (u16)(cb_desc->pkt_size + entry_tmp->Offset);
         entry_tmp->QueueSelect = QSLT_CMD;
         entry_tmp->TxFWInfoSize = 0x08;
@@ -2057,7 +2057,7 @@ rtl8192_InitializeVariables(struct net_device  *dev)
                IEEE_SOFTMAC_PROBERS | IEEE_SOFTMAC_TX_QUEUE /* |
                IEEE_SOFTMAC_BEACONS*/;
 
-       priv->rtllib->tx_headroom = sizeof(TX_FWINFO_8190PCI);
+       priv->rtllib->tx_headroom = sizeof(struct tx_fwinfo_8190pci);
 
        priv->ShortRetryLimit = 0x30;
        priv->LongRetryLimit = 0x30;

diff --git a/drivers/staging/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl_core.c
index f8a13d9..4e4ad7a 100644 (file)
--- a/drivers/staging/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl_core.c
@@ -2049,7 +2049,7 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff* skb)
 
        priv->rtllib->bAwakePktSent = true;
 
-       fwinfo_size = sizeof(TX_FWINFO_8190PCI);
+       fwinfo_size = sizeof(struct tx_fwinfo_8190pci);
 
        header = (struct rtllib_hdr_1addr *)(((u8*)skb->data) + fwinfo_size);
        fc = header->frame_ctl;