Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc1ad162 authored by Kevin McKinney's avatar Kevin McKinney Committed by Greg Kroah-Hartman
Browse files

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



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: default avatarKevin McKinney <klmckinney1@gmail.com>
Acked-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent da529f0f

drivers/staging/bcm/CmHost.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

	}

drivers/staging/bcm/cntrl_SignalingInterface.h

+2 −6
Original line number Diff line number Diff line
@@ -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 */