From: Kevin McKinney <klmckinney1@gmail.com>
Date: Thu, 22 Nov 2012 19:48:54 +0000 (-0500)
Subject: Staging: bcm: Remove typedef for wrmbuffer and call directly.
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=a2521d79715680386f3dbefbc2ffc93fdf08b58a;p=deliverable%2Flinux.git

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: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 7250c48ddfde..a8184a5386f7 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -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)) {
diff --git a/drivers/staging/bcm/Ioctl.h b/drivers/staging/bcm/Ioctl.h
index 440bff5df6ad..5910ba509ace 100644
--- a/drivers/staging/bcm/Ioctl.h
+++ b/drivers/staging/bcm/Ioctl.h
@@ -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;