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

This patch removes typedef for
stLocalSFAddIndicationAlt, changes the
name of the struct to bcm_add_indication_alt,
and removes a comment. In addition, any
calls to typedef stLocalSFAddIndicationAlt
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/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 3d02c2ebfb8d455377a97cacb92d3d321f8f5707..4a7e12b6942bfc92dc952bc8224da35d180bd7cc 100644 (file)
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -1060,10 +1060,10 @@ cntrlEnd:
                if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
                        return -EFAULT;
 
-               if (IoBuffer.OutputLength < sizeof(stLocalSFAddIndicationAlt)) {
+               if (IoBuffer.OutputLength < sizeof(struct bcm_add_indication_alt)) {
                        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
                                        "Mismatch req: %lx needed is =0x%zx!!!",
-                                       IoBuffer.OutputLength, sizeof(stLocalSFAddIndicationAlt));
+                                       IoBuffer.OutputLength, sizeof(struct bcm_add_indication_alt));
                        return -EINVAL;
                }
 

diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c
index df538386c77e9891bb511ddd4987264d1948ce4d..482e59592cd63721d2ec585d800e57a608f2c4c7 100644 (file)
--- a/drivers/staging/bcm/CmHost.c
+++ b/drivers/staging/bcm/CmHost.c
@@ -431,7 +431,7 @@ static VOID CopyToAdapter(register struct bcm_mini_adapter *Adapter, /* <Pointer
                        register struct bcm_connect_mgr_params *psfLocalSet, /* Pointer to the connection manager parameters structure */
                        register UINT uiSearchRuleIndex, /* <Index of Queue, to which this data belongs */
                        register UCHAR ucDsxType,
-                       stLocalSFAddIndicationAlt *pstAddIndication) {
+                       struct bcm_add_indication_alt *pstAddIndication) {
 
        /* UCHAR ucProtocolLength = 0; */
        ULONG ulSFID;
@@ -833,11 +833,11 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
 {
        int uiLoopIndex;
        int nIndex;
-       stLocalSFAddIndicationAlt *pstAddIndication;
+       struct bcm_add_indication_alt *pstAddIndication;
        UINT nCurClassifierCnt;
        struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
 
-       pstAddIndication = (stLocalSFAddIndicationAlt *)pvBuffer;
+       pstAddIndication = (struct bcm_add_indication_alt *)pvBuffer;
        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "======>");
        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8Type: 0x%X", pstAddIndication->u8Type);
        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8Direction: 0x%X", pstAddIndication->u8Direction);
@@ -1333,13 +1333,13 @@ static ULONG StoreSFParam(struct bcm_mini_adapter *Adapter, PUCHAR pucSrcBuffer,
 
 ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBuffer, UINT *puBufferLength)
 {
-       stLocalSFAddIndicationAlt *pstAddIndicationAlt = NULL;
+       struct bcm_add_indication_alt *pstAddIndicationAlt = NULL;
        struct bcm_add_indication *pstAddIndication = NULL;
        struct bcm_del_request *pstDeletionRequest;
        UINT uiSearchRuleIndex;
        ULONG ulSFID;
 
-       pstAddIndicationAlt = (stLocalSFAddIndicationAlt *)(pvBuffer);
+       pstAddIndicationAlt = (struct bcm_add_indication_alt *)(pvBuffer);
 
        /*
         * In case of DSD Req By MS, we should immediately delete this SF so that
@@ -1445,29 +1445,29 @@ ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBu
        return 1;
 }
 
-static inline stLocalSFAddIndicationAlt
+static inline struct bcm_add_indication_alt
 *RestoreCmControlResponseMessage(register struct bcm_mini_adapter *Adapter, register PVOID pvBuffer)
 {
        ULONG ulStatus = 0;
        struct bcm_add_indication *pstAddIndication = NULL;
-       stLocalSFAddIndicationAlt *pstAddIndicationDest = NULL;
+       struct bcm_add_indication_alt *pstAddIndicationDest = NULL;
 
        pstAddIndication = (struct bcm_add_indication *)(pvBuffer);
        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "=====>");
        if ((pstAddIndication->u8Type == DSD_REQ) ||
                (pstAddIndication->u8Type == DSD_RSP) ||
                (pstAddIndication->u8Type == DSD_ACK))
-               return (stLocalSFAddIndicationAlt *)pvBuffer;
+               return (struct bcm_add_indication_alt *)pvBuffer;
 
        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Inside RestoreCmControlResponseMessage ");
        /*
         * Need to Allocate memory to contain the SUPER Large structures
         * Our driver can't create these structures on Stack :(
         */
-       pstAddIndicationDest = kmalloc(sizeof(stLocalSFAddIndicationAlt), GFP_KERNEL);
+       pstAddIndicationDest = kmalloc(sizeof(struct bcm_add_indication_alt), GFP_KERNEL);
 
        if (pstAddIndicationDest) {
-               memset(pstAddIndicationDest, 0, sizeof(stLocalSFAddIndicationAlt));
+               memset(pstAddIndicationDest, 0, sizeof(struct bcm_add_indication_alt));
        } else {
                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Failed to allocate memory for SF Add Indication Structure ");
                return NULL;
@@ -1611,7 +1611,7 @@ int AllocAdapterDsxBuffer(struct bcm_mini_adapter *Adapter)
         * Need to Allocate memory to contain the SUPER Large structures
         * Our driver can't create these structures on Stack
         */
-       Adapter->caDsxReqResp = kmalloc(sizeof(stLocalSFAddIndicationAlt)+LEADER_SIZE, GFP_KERNEL);
+       Adapter->caDsxReqResp = kmalloc(sizeof(struct bcm_add_indication_alt)+LEADER_SIZE, GFP_KERNEL);
        if (!Adapter->caDsxReqResp)
                return -ENOMEM;
 
@@ -1634,7 +1634,7 @@ BOOLEAN CmControlResponseMessage(struct bcm_mini_adapter *Adapter,  /* <Pointer
                                PVOID pvBuffer /* Starting Address of the Buffer, that contains the AddIndication Data */)
 {
        struct bcm_connect_mgr_params *psfLocalSet = NULL;
-       stLocalSFAddIndicationAlt *pstAddIndication = NULL;
+       struct bcm_add_indication_alt *pstAddIndication = NULL;
        struct bcm_change_indication *pstChangeIndication = NULL;
        struct bcm_leader *pLeader = NULL;
 
@@ -1661,12 +1661,12 @@ BOOLEAN CmControlResponseMessage(struct bcm_mini_adapter *Adapter,  /* <Pointer
        switch (pstAddIndication->u8Type) {
        case DSA_REQ:
        {
-               pLeader->PLength = sizeof(stLocalSFAddIndicationAlt);
+               pLeader->PLength = sizeof(struct bcm_add_indication_alt);
                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Sending DSA Response....\n");
                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "SENDING DSA RESPONSE TO MAC %d", pLeader->PLength);
-               *((stLocalSFAddIndicationAlt *)&(Adapter->caDsxReqResp[LEADER_SIZE]))
+               *((struct bcm_add_indication_alt *)&(Adapter->caDsxReqResp[LEADER_SIZE]))
                        = *pstAddIndication;
-               ((stLocalSFAddIndicationAlt *)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSA_RSP;
+               ((struct bcm_add_indication_alt *)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSA_RSP;
 
                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, " VCID = %x", ntohs(pstAddIndication->u16VCID));
                CopyBufferToControlPacket(Adapter, (PVOID)Adapter->caDsxReqResp);
@@ -1675,12 +1675,12 @@ BOOLEAN CmControlResponseMessage(struct bcm_mini_adapter *Adapter,  /* <Pointer
        break;
        case DSA_RSP:
        {
-               pLeader->PLength = sizeof(stLocalSFAddIndicationAlt);
+               pLeader->PLength = sizeof(struct bcm_add_indication_alt);
                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "SENDING DSA ACK TO MAC %d",
                                pLeader->PLength);
-               *((stLocalSFAddIndicationAlt *)&(Adapter->caDsxReqResp[LEADER_SIZE]))
+               *((struct bcm_add_indication_alt *)&(Adapter->caDsxReqResp[LEADER_SIZE]))
                        = *pstAddIndication;
-               ((stLocalSFAddIndicationAlt *)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSA_ACK;
+               ((struct bcm_add_indication_alt *)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSA_ACK;
 
        } /* no break here..we should go down. */
        case DSA_ACK:
@@ -1902,7 +1902,7 @@ int get_dsx_sf_data_to_application(struct bcm_mini_adapter *Adapter, UINT uiSFId
        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "status =%d", status);
        psSfInfo = &Adapter->PackInfo[status];
        if (psSfInfo->pstSFIndication && copy_to_user(user_buffer,
-                                                       psSfInfo->pstSFIndication, sizeof(stLocalSFAddIndicationAlt))) {
+                                                       psSfInfo->pstSFIndication, sizeof(struct bcm_add_indication_alt))) {
                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "copy to user failed SFID %d, present in queue !!!", uiSFId);
                status = -EFAULT;
                return status;

diff --git a/drivers/staging/bcm/CmHost.h b/drivers/staging/bcm/CmHost.h
index 8572defa83f1ad6382c8931af0fe3c3ebbe13573..77f8fae16b66804ce965da33b1e667cefc322317 100644 (file)
--- a/drivers/staging/bcm/CmHost.h
+++ b/drivers/staging/bcm/CmHost.h
@@ -36,8 +36,7 @@ typedef struct stLocalSFAddRequestAlt {
        /* USE_MEMORY_MANAGER(); */
 } stLocalSFAddRequestAlt;
 
-/* brief structure stLocalSFAddIndication */
-typedef struct stLocalSFAddIndicationAlt {
+struct bcm_add_indication_alt {
        u8      u8Type;
        u8      u8Direction;
        u16     u16TID;
@@ -51,8 +50,7 @@ typedef struct stLocalSFAddIndicationAlt {
        u8      u8CC;    /* < Confirmation Code */
        u8      u8Padd;  /* < 8-bit Padding */
        u16     u16Padd; /* < 16 bit Padding */
-/* USE_MEMORY_MANAGER(); */
-} stLocalSFAddIndicationAlt;
+};
 
 struct bcm_change_indication {
        u8      u8Type;

diff --git a/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c
index c3866d9f35801603d7230a65f40e3912c7338f56..453a2fa28b1673cafb73b5c2eb52e59098effdd7 100644 (file)
--- a/drivers/staging/bcm/Misc.c
+++ b/drivers/staging/bcm/Misc.c
@@ -346,7 +346,7 @@ int CopyBufferToControlPacket(struct bcm_mini_adapter *Adapter, void *ioBuffer)
                        pktlen = pLeader->PLength;
                        Status = StoreCmControlResponseMessage(Adapter, pucAddIndication, &pktlen);
                        if (Status != 1) {
-                               ClearTargetDSXBuffer(Adapter, ((stLocalSFAddIndicationAlt *)pucAddIndication)->u16TID, FALSE);
+                               ClearTargetDSXBuffer(Adapter, ((struct bcm_add_indication_alt *)pucAddIndication)->u16TID, FALSE);
                                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, " Error Restoring The DSX Control Packet. Dsx Buffers on Target may not be Setup Properly ");
                                return STATUS_FAILURE;
                        }