aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/bcm
diff options
context:
space:
mode:
authorKevin McKinney <klmckinney1@gmail.com>2012-11-22 14:48:40 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-26 16:05:12 -0800
commit63df64a27a42deb75907b411f0e2f5916febc241 (patch)
tree96d5648e89a18abf5b658e5332b26d8b2ee90ddb /drivers/staging/bcm
parent9e91edb71d899818ca769aa372372a8ed998357a (diff)
Staging: bcm: Remove typedef for stGPIOMultiInfo and call directly.
This patch removes typedef for stGPIOMultiInfo, and changes the name of the struct to bcm_gpio_multi_info. In addition, any calls to typedefs GPIO_MULTI_INFO, or *PGPIO_MULTI_INFO are changed to call the struct directly. Signed-off-by: Kevin McKinney <klmckinney1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/bcm')
-rw-r--r--drivers/staging/bcm/Bcmchar.c6
-rw-r--r--drivers/staging/bcm/Ioctl.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 73ed3d60d4f..f3762163b5a 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -552,10 +552,10 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
case IOCTL_BCM_GPIO_MULTI_REQUEST: {
UCHAR ucResetValue[4];
- GPIO_MULTI_INFO gpio_multi_info[MAX_IDX];
- PGPIO_MULTI_INFO pgpio_multi_info = (PGPIO_MULTI_INFO)gpio_multi_info;
+ struct bcm_gpio_multi_info gpio_multi_info[MAX_IDX];
+ struct bcm_gpio_multi_info *pgpio_multi_info = (struct bcm_gpio_multi_info *)gpio_multi_info;
- memset(pgpio_multi_info, 0, MAX_IDX * sizeof(GPIO_MULTI_INFO));
+ memset(pgpio_multi_info, 0, MAX_IDX * sizeof(struct bcm_gpio_multi_info));
if ((Adapter->IdleMode == TRUE) ||
(Adapter->bShutStatus == TRUE) ||
diff --git a/drivers/staging/bcm/Ioctl.h b/drivers/staging/bcm/Ioctl.h
index f5d9b4af49f..6f112c8e121 100644
--- a/drivers/staging/bcm/Ioctl.h
+++ b/drivers/staging/bcm/Ioctl.h
@@ -219,11 +219,11 @@ enum {
MAX_IDX
};
-typedef struct stGPIOMultiInfo {
+struct bcm_gpio_multi_info {
unsigned int uiGPIOCommand; /* 1 for set and 0 for get */
unsigned int uiGPIOMask; /* set the correspondig bit to 1 to access GPIO */
unsigned int uiGPIOValue; /* 0 or 1; value to be set when command is 1. */
-} __packed GPIO_MULTI_INFO, *PGPIO_MULTI_INFO;
+} __packed;
struct bcm_gpio_multi_mode {
unsigned int uiGPIOMode; /* 1 for OUT mode, 0 for IN mode */