[PATCH 4/8] Staging: bcm: Remove typedef for _stLocalSFAddRequest and call directly.

Kevin McKinney klmckinney1 at gmail.com
Sat Sep 22 05:24:35 UTC 2012


This patch removes typedef for _stLocalSFAddRequest,
and changes the name of the struct to
bcm_add_request. In addition, any
calls to typedefs "stLocalSFAddRequest or
*pstLocalSFAddRequest" are changed to
call the struct directly.

Signed-off-by: Kevin McKinney <klmckinney1 at gmail.com>
---
 drivers/staging/bcm/CmHost.c                   |    6 +++---
 drivers/staging/bcm/cntrl_SignalingInterface.h |    8 ++------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c
index 83c525c..8ccfbae 100644
--- a/drivers/staging/bcm/CmHost.c
+++ b/drivers/staging/bcm/CmHost.c
@@ -1387,7 +1387,7 @@ ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBu
 	pstAddIndication->psfAuthorizedSet = (stServiceFlowParamSI *)ntohl((ULONG)pstAddIndication->psfAuthorizedSet);
 
 	if (pstAddIndicationAlt->u8Type == DSA_REQ) {
-		stLocalSFAddRequest AddRequest;
+		struct bcm_add_request AddRequest;
 
 		AddRequest.u8Type = pstAddIndicationAlt->u8Type;
 		AddRequest.eConnectionDir = pstAddIndicationAlt->u8Direction;
@@ -1395,8 +1395,8 @@ ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBu
 		AddRequest.u16CID = pstAddIndicationAlt->u16CID;
 		AddRequest.u16VCID = pstAddIndicationAlt->u16VCID;
 		AddRequest.psfParameterSet = pstAddIndication->psfAuthorizedSet;
-		(*puBufferLength) = sizeof(stLocalSFAddRequest);
-		memcpy(pvBuffer, &AddRequest, sizeof(stLocalSFAddRequest));
+		(*puBufferLength) = sizeof(struct bcm_add_request);
+		memcpy(pvBuffer, &AddRequest, sizeof(struct bcm_add_request));
 		kfree(pstAddIndication);
 		return 1;
 	}
diff --git a/drivers/staging/bcm/cntrl_SignalingInterface.h b/drivers/staging/bcm/cntrl_SignalingInterface.h
index fbdc231..43d462e 100644
--- a/drivers/staging/bcm/cntrl_SignalingInterface.h
+++ b/drivers/staging/bcm/cntrl_SignalingInterface.h
@@ -260,10 +260,7 @@ typedef struct _stServiceFlowParamSI {
 } stServiceFlowParamSI, *pstServiceFlowParamSI;
 typedef stServiceFlowParamSI CServiceFlowParamSI;
 
-/*
- * structure stLocalSFAddRequest
- */
-typedef struct _stLocalSFAddRequest {
+struct bcm_add_request {
 	B_UINT8 u8Type;	/* < Type */
 	B_UINT8 eConnectionDir; /* < Connection direction */
 	/* brief 16 bit TID */
@@ -274,8 +271,7 @@ typedef struct _stLocalSFAddRequest {
 	B_UINT16 u16VCID; /* < 16bit VCID */
 	/* brief structure ParameterSet */
 	stServiceFlowParamSI *psfParameterSet; /* < structure ParameterSet */
-
-} stLocalSFAddRequest, *pstLocalSFAddRequest;
+};
 
 struct bcm_add_indication {
 	B_UINT8 u8Type;	/* < Type */
-- 
1.7.9.5




More information about the devel mailing list