From 63df64a27a42deb75907b411f0e2f5916febc241 Mon Sep 17 00:00:00 2001 From: Kevin McKinney Date: Thu, 22 Nov 2012 14:48:40 -0500 Subject: [PATCH] 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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/bcm/Bcmchar.c | 6 +++--- drivers/staging/bcm/Ioctl.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c index 73ed3d60d4fc..f3762163b5aa 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 f5d9b4af49f7..6f112c8e1215 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 */ -- 2.20.1