Skip to content

Commit

Permalink
Staging: bcm: Remove typedef for wrmbuffer and call directly.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Kevin McKinney authored and Greg Kroah-Hartman committed Nov 27, 2012
1 parent 86d289d commit a2521d7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
5 changes: 3 additions & 2 deletions drivers/staging/bcm/Bcmchar.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down Expand Up @@ -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)) {
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/bcm/Ioctl.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit a2521d7

Please sign in to comment.