From dc23445a118addb0b79e60754e70f99a3cf5177b Mon Sep 17 00:00:00 2001 From: Kevin McKinney Date: Thu, 22 Nov 2012 14:48:55 -0500 Subject: [PATCH] Staging: bcm: Remove typedef for rdmbuffer and call directly. This patch removes typedef for rdmbuffer, and changes the name of the struct to bcm_rdm_buffer. In addition, any calls to typedefs RDM_BUFFER, or *PRDM_BUFFER are changed to call the struct directly. Signed-off-by: Kevin McKinney Signed-off-by: Greg Kroah-Hartman --- drivers/staging/bcm/Bcmchar.c | 4 ++-- drivers/staging/bcm/Ioctl.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c index a8184a5386f7..7c179e1adffc 100644 --- a/drivers/staging/bcm/Bcmchar.c +++ b/drivers/staging/bcm/Bcmchar.c @@ -203,7 +203,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) switch (cmd) { /* Rdms for Swin Idle... */ case IOCTL_BCM_REGISTER_READ_PRIVATE: { - RDM_BUFFER sRdmBuffer = {0}; + struct bcm_rdm_buffer sRdmBuffer = {0}; PCHAR temp_buff; UINT Bufflen; u16 temp_value; @@ -287,7 +287,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) case IOCTL_BCM_REGISTER_READ: case IOCTL_BCM_EEPROM_REGISTER_READ: { - RDM_BUFFER sRdmBuffer = {0}; + struct bcm_rdm_buffer sRdmBuffer = {0}; PCHAR temp_buff = NULL; UINT uiTempVar = 0; if ((Adapter->IdleMode == TRUE) || diff --git a/drivers/staging/bcm/Ioctl.h b/drivers/staging/bcm/Ioctl.h index 5910ba509ace..8c70af90969b 100644 --- a/drivers/staging/bcm/Ioctl.h +++ b/drivers/staging/bcm/Ioctl.h @@ -1,10 +1,10 @@ #ifndef _IOCTL_H_ #define _IOCTL_H_ -typedef struct rdmbuffer { +struct bcm_rdm_buffer { unsigned long Register; unsigned long Length; -} __packed RDM_BUFFER, *PRDM_BUFFER; +} __packed; struct bcm_wrm_buffer { unsigned long Register; -- 2.20.1