From ec5bb992648881f1721a555f9a4652e60e17880f Mon Sep 17 00:00:00 2001 From: Kevin McKinney Date: Sun, 23 Sep 2012 23:07:11 -0400 Subject: [PATCH] Staging: bcm: Remove typedef for _stLocalSFDeleteRequest and call directly. This patch removes typedef for _stLocalSFDeleteRequest, and changes the name of the struct to bcm_del_request. In addition, any calls to typedefs "stLocalSFDeleteRequest or *pstLocalSFDeleteRequest" are changed to call the struct directly. Signed-off-by: Kevin McKinney Acked-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman --- drivers/staging/bcm/CmHost.c | 4 ++-- drivers/staging/bcm/cntrl_SignalingInterface.h | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c index 1d1f55067029..fd2780d41e9a 100644 --- a/drivers/staging/bcm/CmHost.c +++ b/drivers/staging/bcm/CmHost.c @@ -1335,7 +1335,7 @@ ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBu { stLocalSFAddIndicationAlt *pstAddIndicationAlt = NULL; stLocalSFAddIndication *pstAddIndication = NULL; - stLocalSFDeleteRequest *pstDeletionRequest; + struct bcm_del_request *pstDeletionRequest; UINT uiSearchRuleIndex; ULONG ulSFID; @@ -1346,7 +1346,7 @@ ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBu * we can stop the further classifying the pkt for this SF. */ if (pstAddIndicationAlt->u8Type == DSD_REQ) { - pstDeletionRequest = (stLocalSFDeleteRequest *)pvBuffer; + pstDeletionRequest = (struct bcm_del_request *)pvBuffer; ulSFID = ntohl(pstDeletionRequest->u32SFID); uiSearchRuleIndex = SearchSfid(Adapter, ulSFID); diff --git a/drivers/staging/bcm/cntrl_SignalingInterface.h b/drivers/staging/bcm/cntrl_SignalingInterface.h index a2e1bf560dbb..0f9ecc04688d 100644 --- a/drivers/staging/bcm/cntrl_SignalingInterface.h +++ b/drivers/staging/bcm/cntrl_SignalingInterface.h @@ -312,16 +312,13 @@ typedef struct _stLocalSFAddIndication stLocalSFChangeRequest, *pstLocalSFChange */ typedef struct _stLocalSFAddIndication stLocalSFChangeIndication, *pstLocalSFChangeIndication; -/* - * structure stLocalSFDeleteRequest - */ -typedef struct _stLocalSFDeleteRequest { +struct bcm_del_request { B_UINT8 u8Type; /* < Type */ B_UINT8 u8Padding; /* < Padding byte */ B_UINT16 u16TID; /* < TID */ /* brief 32bitSFID */ B_UINT32 u32SFID; /* < SFID */ -} stLocalSFDeleteRequest, *pstLocalSFDeleteRequest; +}; struct bcm_del_indication { B_UINT8 u8Type; /* < Type */