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

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



This patch removes typedef for wrmbuffer, and
changes the name of the struct to bcm_wrm_buffer.
In addition, any calls to typedefs WRM_BUFFER, or
*PWRM_BUFFER 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 86d289d2

drivers/staging/bcm/Bcmchar.c

+3 −2
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
	}



	case IOCTL_BCM_REGISTER_WRITE_PRIVATE: {

		WRM_BUFFER  sWrmBuffer = {0};

		struct bcm_wrm_buffer sWrmBuffer = {0};

		UINT uiTempVar = 0;

		/* Copy Ioctl Buffer structure */
@@ -345,8 +345,9 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
	}

	case IOCTL_BCM_REGISTER_WRITE:

	case IOCTL_BCM_EEPROM_REGISTER_WRITE: {

		WRM_BUFFER  sWrmBuffer = {0};

		struct bcm_wrm_buffer sWrmBuffer = {0};

		UINT uiTempVar = 0;



		if ((Adapter->IdleMode == TRUE) ||

			(Adapter->bShutStatus == TRUE) ||

			(Adapter->bPreparingForLowPowerMode == TRUE)) {

drivers/staging/bcm/Ioctl.h

+2 −2
Original line number Diff line number Diff line
@@ -6,11 +6,11 @@ typedef struct rdmbuffer { 
	unsigned long Length;

} __packed RDM_BUFFER, *PRDM_BUFFER;



typedef struct wrmbuffer {

struct bcm_wrm_buffer {

	unsigned long Register;

	unsigned long Length;

	unsigned char Data[4];

} __packed WRM_BUFFER, *PWRM_BUFFER;

} __packed;



struct bcm_ioctl_buffer {

	void __user *InputBuffer;