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

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

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



This patch removes typedef for link_request, changes the
name of the struct from link_request to bcm_link_request.
In addition, any calls to the following typedefs
"LINK_REQUEST, *PLINK_REQUEST, *CONTROL_MESSAGE"
are changed to call the struct directly.

Signed-off-by: default avatarKevin McKinney <klmckinney1@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 845bd532

drivers/staging/bcm/Adapter.h

+1 −4
Original line number Diff line number Diff line
@@ -28,11 +28,10 @@ struct _CONTROL_PACKET { 
} __packed;

typedef struct _CONTROL_PACKET CONTROL_PACKET, *PCONTROL_PACKET;



struct link_request {

struct bcm_link_request {

	LEADER	Leader;

	UCHAR	szData[4];

} __packed;

typedef struct link_request LINK_REQUEST, *PLINK_REQUEST;



#define MAX_IP_RANGE_LENGTH 4

#define MAX_PORT_RANGE 4
@@ -417,8 +416,6 @@ struct bcm_firmware_info { 
/* holds the value of net_device structure.. */

extern struct net_device *gblpnetdev;



typedef LINK_REQUEST CONTROL_MESSAGE;



struct bcm_ddr_setting {

	UINT ulRegAddress;

	UINT ulRegValue;

drivers/staging/bcm/Bcmchar.c

+1 −1
Original line number Diff line number Diff line
@@ -722,7 +722,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
		if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))

			return -EFAULT;



		if (IoBuffer.InputLength < sizeof(struct link_request))

		if (IoBuffer.InputLength < sizeof(struct bcm_link_request))

			return -EINVAL;



		if (IoBuffer.InputLength > MAX_CNTL_PKT_SIZE)

drivers/staging/bcm/InterfaceTx.c

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ static void write_bulk_callback(struct urb *urb/*, struct pt_regs *regs*/) 
{

	PUSB_TCB pTcb= (PUSB_TCB)urb->context;

	PS_INTERFACE_ADAPTER psIntfAdapter = pTcb->psIntfAdapter;

	CONTROL_MESSAGE *pControlMsg = (CONTROL_MESSAGE *)urb->transfer_buffer;

	struct bcm_link_request *pControlMsg = (struct bcm_link_request *)urb->transfer_buffer;

	PMINI_ADAPTER psAdapter = psIntfAdapter->psAdapter ;

	BOOLEAN bpowerDownMsg = FALSE ;

    PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);

drivers/staging/bcm/Misc.c

+9 −9
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ INT CopyBufferToControlPacket(PMINI_ADAPTER Adapter, PVOID ioBuffer) 
	INT Status = 0;

	unsigned char *ctrl_buff = NULL;

	UINT pktlen = 0;

	PLINK_REQUEST pLinkReq = NULL;

	struct bcm_link_request *pLinkReq = NULL;

	PUCHAR pucAddIndication = NULL;



	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "======>");
@@ -246,7 +246,7 @@ INT CopyBufferToControlPacket(PMINI_ADAPTER Adapter, PVOID ioBuffer) 
		return -EINVAL;

	}



	pLinkReq = (PLINK_REQUEST)ioBuffer;

	pLinkReq = (struct bcm_link_request *)ioBuffer;

	pLeader = (PLEADER)ioBuffer; /* ioBuffer Contains sw_Status and Payload */



	if (Adapter->bShutStatus == TRUE &&
@@ -414,7 +414,7 @@ INT CopyBufferToControlPacket(PMINI_ADAPTER Adapter, PVOID ioBuffer) 
*

* Returns     - None.

*****************************************************************/

static VOID SendStatisticsPointerRequest(PMINI_ADAPTER Adapter, PLINK_REQUEST pstStatisticsPtrRequest)

static VOID SendStatisticsPointerRequest(PMINI_ADAPTER Adapter, struct bcm_link_request *pstStatisticsPtrRequest)

{

	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL, "======>");

	pstStatisticsPtrRequest->Leader.Status = STATS_POINTER_REQ_STATUS;
@@ -438,10 +438,10 @@ static VOID SendStatisticsPointerRequest(PMINI_ADAPTER Adapter, PLINK_REQUEST ps 
*******************************************************************/

VOID LinkMessage(PMINI_ADAPTER Adapter)

{

	PLINK_REQUEST pstLinkRequest = NULL;

	struct bcm_link_request *pstLinkRequest = NULL;

	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LINK_UP_MSG, DBG_LVL_ALL, "=====>");

	if (Adapter->LinkStatus == SYNC_UP_REQUEST && Adapter->AutoSyncup) {

		pstLinkRequest = kzalloc(sizeof(LINK_REQUEST), GFP_ATOMIC);

		pstLinkRequest = kzalloc(sizeof(struct bcm_link_request), GFP_ATOMIC);

		if (!pstLinkRequest) {

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LINK_UP_MSG, DBG_LVL_ALL, "Can not allocate memory for Link request!");

			return;
@@ -456,7 +456,7 @@ VOID LinkMessage(PMINI_ADAPTER Adapter) 
		Adapter->bSyncUpRequestSent = TRUE;



	} else if (Adapter->LinkStatus == PHY_SYNC_ACHIVED && Adapter->AutoLinkUp) {

		pstLinkRequest = kzalloc(sizeof(LINK_REQUEST), GFP_ATOMIC);

		pstLinkRequest = kzalloc(sizeof(struct bcm_link_request), GFP_ATOMIC);

		if (!pstLinkRequest) {

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LINK_UP_MSG, DBG_LVL_ALL, "Can not allocate memory for Link request!");

			return;
@@ -584,7 +584,7 @@ void SendIdleModeResponse(PMINI_ADAPTER Adapter) 
{

	INT status = 0, NVMAccess = 0, lowPwrAbortMsg = 0;

	struct timeval tv;

	CONTROL_MESSAGE stIdleResponse = {{0} };

	struct bcm_link_request stIdleResponse = {{0} };

	memset(&tv, 0, sizeof(tv));

	stIdleResponse.Leader.Status = IDLE_MESSAGE;

	stIdleResponse.Leader.PLength = IDLE_MODE_PAYLOAD_LENGTH;
@@ -1392,11 +1392,11 @@ static VOID HandleShutDownModeWakeup(PMINI_ADAPTER Adapter) 


static VOID SendShutModeResponse(PMINI_ADAPTER Adapter)

{

	CONTROL_MESSAGE stShutdownResponse;

	struct bcm_link_request stShutdownResponse;

	UINT NVMAccess = 0, lowPwrAbortMsg = 0;

	UINT Status = 0;



	memset(&stShutdownResponse, 0, sizeof(CONTROL_MESSAGE));

	memset(&stShutdownResponse, 0, sizeof(struct bcm_link_request));

	stShutdownResponse.Leader.Status  = LINK_UP_CONTROL_REQ;

	stShutdownResponse.Leader.PLength = 8; /* 8 bytes; */

	stShutdownResponse.szData[0] = LINK_UP_ACK;