diff options
author | Kevin McKinney <klmckinney1@gmail.com> | 2012-09-23 23:07:11 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-26 12:31:51 -0400 |
commit | ec5bb992648881f1721a555f9a4652e60e17880f (patch) | |
tree | c28d05272ca42b25874b48a94f7ad9c8188294e9 | |
parent | de473db168ad279fbae5419f03ce0797637ca6df (diff) |
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 <klmckinney1@gmail.com>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/bcm/CmHost.c | 4 | ||||
-rw-r--r-- | 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 | |||
1335 | { | 1335 | { |
1336 | stLocalSFAddIndicationAlt *pstAddIndicationAlt = NULL; | 1336 | stLocalSFAddIndicationAlt *pstAddIndicationAlt = NULL; |
1337 | stLocalSFAddIndication *pstAddIndication = NULL; | 1337 | stLocalSFAddIndication *pstAddIndication = NULL; |
1338 | stLocalSFDeleteRequest *pstDeletionRequest; | 1338 | struct bcm_del_request *pstDeletionRequest; |
1339 | UINT uiSearchRuleIndex; | 1339 | UINT uiSearchRuleIndex; |
1340 | ULONG ulSFID; | 1340 | ULONG ulSFID; |
1341 | 1341 | ||
@@ -1346,7 +1346,7 @@ ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBu | |||
1346 | * we can stop the further classifying the pkt for this SF. | 1346 | * we can stop the further classifying the pkt for this SF. |
1347 | */ | 1347 | */ |
1348 | if (pstAddIndicationAlt->u8Type == DSD_REQ) { | 1348 | if (pstAddIndicationAlt->u8Type == DSD_REQ) { |
1349 | pstDeletionRequest = (stLocalSFDeleteRequest *)pvBuffer; | 1349 | pstDeletionRequest = (struct bcm_del_request *)pvBuffer; |
1350 | 1350 | ||
1351 | ulSFID = ntohl(pstDeletionRequest->u32SFID); | 1351 | ulSFID = ntohl(pstDeletionRequest->u32SFID); |
1352 | uiSearchRuleIndex = SearchSfid(Adapter, ulSFID); | 1352 | 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 | |||
312 | */ | 312 | */ |
313 | typedef struct _stLocalSFAddIndication stLocalSFChangeIndication, *pstLocalSFChangeIndication; | 313 | typedef struct _stLocalSFAddIndication stLocalSFChangeIndication, *pstLocalSFChangeIndication; |
314 | 314 | ||
315 | /* | 315 | struct bcm_del_request { |
316 | * structure stLocalSFDeleteRequest | ||
317 | */ | ||
318 | typedef struct _stLocalSFDeleteRequest { | ||
319 | B_UINT8 u8Type; /* < Type */ | 316 | B_UINT8 u8Type; /* < Type */ |
320 | B_UINT8 u8Padding; /* < Padding byte */ | 317 | B_UINT8 u8Padding; /* < Padding byte */ |
321 | B_UINT16 u16TID; /* < TID */ | 318 | B_UINT16 u16TID; /* < TID */ |
322 | /* brief 32bitSFID */ | 319 | /* brief 32bitSFID */ |
323 | B_UINT32 u32SFID; /* < SFID */ | 320 | B_UINT32 u32SFID; /* < SFID */ |
324 | } stLocalSFDeleteRequest, *pstLocalSFDeleteRequest; | 321 | }; |
325 | 322 | ||
326 | struct bcm_del_indication { | 323 | struct bcm_del_indication { |
327 | B_UINT8 u8Type; /* < Type */ | 324 | B_UINT8 u8Type; /* < Type */ |