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 7250c48ddfde8933c4adcbc01bc94452b45a4b8a..a8184a5386f780391cad399b759823ff684b73ac 100644 (file)
--- 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 440bff5df6ada2ba93f994aa4a7ba5d1a164eac3..5910ba509ace3c18417f345b87febe2d0ccb47a7 100644 (file)
--- 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;