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

This patch removes typedef for
stLocalSFDeleteIndication, and
changes the name of the struct to
bcm_del_indication. In addition, any
calls to the following typedef
"stLocalSFDeleteIndication" are changed to call
the struct directly.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c
index 25aa20aad65ebf7f80ca4fd4460cd8dbffacc452..1d1f55067029f37097a9a8fdaff9f2a195e7c7d6 100644 (file)
--- a/drivers/staging/bcm/CmHost.c
+++ b/drivers/staging/bcm/CmHost.c
@@ -1856,10 +1856,10 @@ BOOLEAN CmControlResponseMessage(struct bcm_mini_adapter *Adapter,  /* <Pointer
                UINT uiSearchRuleIndex;
                ULONG ulSFID;
 
-               pLeader->PLength = sizeof(stLocalSFDeleteIndication);
-               *((stLocalSFDeleteIndication *)&(Adapter->caDsxReqResp[LEADER_SIZE])) = *((stLocalSFDeleteIndication *)pstAddIndication);
+               pLeader->PLength = sizeof(struct bcm_del_indication);
+               *((struct bcm_del_indication *)&(Adapter->caDsxReqResp[LEADER_SIZE])) = *((struct bcm_del_indication *)pstAddIndication);
 
-               ulSFID = ntohl(((stLocalSFDeleteIndication *)pstAddIndication)->u32SFID);
+               ulSFID = ntohl(((struct bcm_del_indication *)pstAddIndication)->u32SFID);
                uiSearchRuleIndex = SearchSfid(Adapter, ulSFID);
                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "DSD - Removing connection %x", uiSearchRuleIndex);
 
@@ -1870,7 +1870,7 @@ BOOLEAN CmControlResponseMessage(struct bcm_mini_adapter *Adapter,  /* <Pointer
                }
 
                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "SENDING DSD RESPONSE TO MAC");
-               ((stLocalSFDeleteIndication *)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSD_RSP;
+               ((struct bcm_del_indication *)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSD_RSP;
                CopyBufferToControlPacket(Adapter, (PVOID)Adapter->caDsxReqResp);
        }
        case DSD_RSP:

diff --git a/drivers/staging/bcm/cntrl_SignalingInterface.h b/drivers/staging/bcm/cntrl_SignalingInterface.h
index 11b3181d537af3bae81c09ca96cf127339ec2646..a2e1bf560dbbc7f3ffb366f7fc7fc31d634e4562 100644 (file)
--- a/drivers/staging/bcm/cntrl_SignalingInterface.h
+++ b/drivers/staging/bcm/cntrl_SignalingInterface.h
@@ -323,10 +323,7 @@ typedef struct _stLocalSFDeleteRequest {
        B_UINT32 u32SFID; /* < SFID */
 } stLocalSFDeleteRequest, *pstLocalSFDeleteRequest;
 
-/*
- * structure stLocalSFDeleteIndication
- */
-typedef struct stLocalSFDeleteIndication {
+struct bcm_del_indication {
        B_UINT8 u8Type; /* < Type */
        B_UINT8 u8Padding; /* < Padding */
        B_UINT16 u16TID; /* < TID */
@@ -339,7 +336,7 @@ typedef struct stLocalSFDeleteIndication {
        /* brief 8bit Confirmation code */
        B_UINT8 u8ConfirmationCode; /* < Confirmation code */
        B_UINT8 u8Padding1[3]; /* < 3 byte Padding */
-} stLocalSFDeleteIndication;
+};
 
 struct bcm_stim_sfhostnotify {
        B_UINT32 SFID; /* SFID of the service flow */