Staging: bcm: Remove typedef for _LEADER and call directly.

This patch removes typedef for _LEADER, changes the
name of the struct from _LEADER to bcm_leader.
In addition, any calls to the following typedefs
"LEADER, *PLEADER" are changed to call
the struct directly.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index fce61ed2ab063b05d5c9aa1e80f1c6d8a97512c2..f269daa2d52d0325a1ba84374d9139d40f7d97bc 100644 (file)
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -7,16 +7,15 @@
 #define MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES 256
 #include "Debug.h"
 
-struct _LEADER {
+struct bcm_leader {
        USHORT  Vcid;
        USHORT  PLength;
        UCHAR   Status;
        UCHAR   Unused[3];
 } __packed;
-typedef struct _LEADER LEADER, *PLEADER;
 
 struct bcm_packettosend {
-       LEADER  Leader;
+       struct bcm_leader Leader;
        UCHAR   ucPayload;
 } __packed;
 
@@ -27,7 +26,7 @@ struct bcm_control_packet {
 } __packed;
 
 struct bcm_link_request {
-       LEADER  Leader;
+       struct bcm_leader Leader;
        UCHAR   szData[4];
 } __packed;
 

diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c
index a0b1720aae3ed99800d29ffb90a5572572a39946..7189df69d81ffe95279fcbf3e3fca03908cf0afe 100644 (file)
--- a/drivers/staging/bcm/CmHost.c
+++ b/drivers/staging/bcm/CmHost.c
@@ -1663,7 +1663,7 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter,  /* <Pointer to the Adap
        stServiceFlowParamSI *psfLocalSet = NULL;
        stLocalSFAddIndicationAlt *pstAddIndication = NULL;
        stLocalSFChangeIndicationAlt *pstChangeIndication = NULL;
-       PLEADER pLeader = NULL;
+       struct bcm_leader *pLeader = NULL;
 
        /*
         * Otherwise the message contains a target address from where we need to
@@ -1678,7 +1678,7 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter,  /* <Pointer to the Adap
 
        DumpCmControlPacket(pstAddIndication);
        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "====>");
-       pLeader = (PLEADER)Adapter->caDsxReqResp;
+       pLeader = (struct bcm_leader *)Adapter->caDsxReqResp;
 
        pLeader->Status = CM_CONTROL_NEWDSX_MULTICLASSIFIER_REQ;
        pLeader->Vcid = 0;

diff --git a/drivers/staging/bcm/InterfaceRx.c b/drivers/staging/bcm/InterfaceRx.c
index d495828a731fca8632f76ee67101e62c972e9f4c..7940a2e7def25b5a937b43c544ae532cb7adaeea 100644 (file)
--- a/drivers/staging/bcm/InterfaceRx.c
+++ b/drivers/staging/bcm/InterfaceRx.c
@@ -46,7 +46,7 @@ static void read_bulk_callback(struct urb *urb)
        PUSB_RCB pRcb = (PUSB_RCB)urb->context;
        PS_INTERFACE_ADAPTER psIntfAdapter = pRcb->psIntfAdapter;
        PMINI_ADAPTER Adapter = psIntfAdapter->psAdapter;
-       PLEADER pLeader = urb->transfer_buffer;
+       struct bcm_leader *pLeader = urb->transfer_buffer;
 
        if (unlikely(netif_msg_rx_status(Adapter)))
                pr_info(PFX "%s: rx urb status %d length %d\n",
@@ -126,7 +126,7 @@ static void read_bulk_callback(struct urb *urb)
            BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_RX, RX_CTRL, DBG_LVL_ALL, "Received control pkt...");
                *(PUSHORT)skb->data = pLeader->Status;
                memcpy(skb->data+sizeof(USHORT), urb->transfer_buffer +
-                       (sizeof(LEADER)), pLeader->PLength);
+                       (sizeof(struct bcm_leader)), pLeader->PLength);
                skb->len = pLeader->PLength + sizeof(USHORT);
 
                spin_lock(&Adapter->control_queue_lock);
@@ -144,7 +144,7 @@ static void read_bulk_callback(struct urb *urb)
                  */
         BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_RX, RX_DATA, DBG_LVL_ALL, "Received Data pkt...");
                skb_reserve(skb, 2 + SKB_RESERVE_PHS_BYTES);
-               memcpy(skb->data+ETH_HLEN, (PUCHAR)urb->transfer_buffer + sizeof(LEADER), pLeader->PLength);
+               memcpy(skb->data+ETH_HLEN, (PUCHAR)urb->transfer_buffer + sizeof(struct bcm_leader), pLeader->PLength);
                skb->dev = Adapter->dev;
 
                /* currently skb->len has extra ETH_HLEN bytes in the beginning */

diff --git a/drivers/staging/bcm/LeakyBucket.c b/drivers/staging/bcm/LeakyBucket.c
index 89f1e577f7cda5b817a26a7d01977915d490bd72..a6584d7c28bd42fc484e5470e62fb105b6420f5c 100644 (file)
--- a/drivers/staging/bcm/LeakyBucket.c
+++ b/drivers/staging/bcm/LeakyBucket.c
@@ -243,10 +243,10 @@ static VOID CheckAndSendPacketFromIndex(PMINI_ADAPTER Adapter, struct bcm_packet
                                {
                                        spin_lock_bh(&psSF->SFQueueLock);
                                        psSF->NumOfPacketsSent++;
-                                       psSF->uiSentBytes+=((PLEADER)pControlPacket)->PLength;
+                                       psSF->uiSentBytes+=((struct bcm_leader *)pControlPacket)->PLength;
                                        psSF->uiSentPackets++;
                                        atomic_dec(&Adapter->TotalPacketCount);
-                                       psSF->uiCurrentBytesOnHost -= ((PLEADER)pControlPacket)->PLength;
+                                       psSF->uiCurrentBytesOnHost -= ((struct bcm_leader *)pControlPacket)->PLength;
                                        psSF->uiCurrentPacketsOnHost--;
                                        atomic_inc(&Adapter->index_rd_txcntrlpkt);
                                        spin_unlock_bh(&psSF->SFQueueLock);

diff --git a/drivers/staging/bcm/Macros.h b/drivers/staging/bcm/Macros.h
index 7c03cce5eede3eb70fd6bc5431bde91817d4f081..b5ca6f6a1cb24d001e523b736a0ca622a4bef7a9 100644 (file)
--- a/drivers/staging/bcm/Macros.h
+++ b/drivers/staging/bcm/Macros.h
@@ -108,7 +108,7 @@
 /*Leader related terms */
 #define LEADER_STATUS         0x00
 #define LEADER_STATUS_TCP_ACK 0x1
-#define LEADER_SIZE           sizeof(LEADER)
+#define LEADER_SIZE           sizeof(struct bcm_leader)
 #define MAC_ADDR_REQ_SIZE     sizeof(struct bcm_packettosend)
 #define SS_INFO_REQ_SIZE      sizeof(struct bcm_packettosend)
 #define CM_REQUEST_SIZE       (LEADER_SIZE + sizeof(stLocalSFChangeRequest))

diff --git a/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c
index 954c3adf79446dc219bce90ed85a6b76f88c3308..2772e9259f42d3369b77f7032b08a399fca38dc5 100644 (file)
--- a/drivers/staging/bcm/Misc.c
+++ b/drivers/staging/bcm/Misc.c
@@ -233,7 +233,7 @@ exit_download:
  */
 INT CopyBufferToControlPacket(PMINI_ADAPTER Adapter, PVOID ioBuffer)
 {
-       PLEADER pLeader = NULL;
+       struct bcm_leader *pLeader = NULL;
        INT Status = 0;
        unsigned char *ctrl_buff = NULL;
        UINT pktlen = 0;
@@ -247,7 +247,7 @@ INT CopyBufferToControlPacket(PMINI_ADAPTER Adapter, PVOID ioBuffer)
        }
 
        pLinkReq = (struct bcm_link_request *)ioBuffer;
-       pLeader = (PLEADER)ioBuffer; /* ioBuffer Contains sw_Status and Payload */
+       pLeader = (struct bcm_leader *)ioBuffer; /* ioBuffer Contains sw_Status and Payload */
 
        if (Adapter->bShutStatus == TRUE &&
                pLinkReq->szData[0] == LINK_DOWN_REQ_PAYLOAD &&
@@ -373,7 +373,7 @@ INT CopyBufferToControlPacket(PMINI_ADAPTER Adapter, PVOID ioBuffer)
 
                memset(ctrl_buff, 0, pktlen+LEADER_SIZE);
                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "Copying the Control Packet Buffer with length=%d\n", pLeader->PLength);
-               *(PLEADER)ctrl_buff = *pLeader;
+               *(struct bcm_leader *)ctrl_buff = *pLeader;
                memcpy(ctrl_buff + LEADER_SIZE, ((PUCHAR)ioBuffer + LEADER_SIZE), pLeader->PLength);
                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "Enqueuing the Control Packet");
 

diff --git a/drivers/staging/bcm/Transmit.c b/drivers/staging/bcm/Transmit.c
index d5e4a7404f71124c6db96b80ba9003a3a5086d5c..63c6a74bb1ff641c2e61e95b26a39e789fd3fd0d 100644 (file)
--- a/drivers/staging/bcm/Transmit.c
+++ b/drivers/staging/bcm/Transmit.c
@@ -43,7 +43,7 @@ This function dispatches control packet to the h/w interface
 */
 INT SendControlPacket(PMINI_ADAPTER Adapter, char *pControlPacket)
 {
-       PLEADER PLeader = (PLEADER)pControlPacket;
+       struct bcm_leader *PLeader = (struct bcm_leader *)pControlPacket;
 
        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "Tx");
        if(!pControlPacket || !Adapter)
@@ -90,7 +90,7 @@ INT SetupNextSend(PMINI_ADAPTER Adapter,  struct sk_buff *Packet, USHORT Vcid)
        BOOLEAN bHeaderSupressionEnabled = FALSE;
        B_UINT16            uiClassifierRuleID;
        u16     QueueIndex = skb_get_queue_mapping(Packet);
-       LEADER Leader={0};
+       struct bcm_leader Leader={0};
 
        if(Packet->len > MAX_DEVICE_DESC_SIZE)
        {
@@ -143,7 +143,7 @@ INT SetupNextSend(PMINI_ADAPTER Adapter,  struct sk_buff *Packet, USHORT Vcid)
        else
        {
                Leader.PLength = Packet->len - ETH_HLEN;
-               memcpy((LEADER*)skb_pull(Packet, (ETH_HLEN - LEADER_SIZE)), &Leader, LEADER_SIZE);
+               memcpy((struct bcm_leader *)skb_pull(Packet, (ETH_HLEN - LEADER_SIZE)), &Leader, LEADER_SIZE);
        }
 
        status = Adapter->interface_transmit(Adapter->pvInterfaceAdapter,