From 86d289d2570bfa469b756e95bf54cb694d12eeb5 Mon Sep 17 00:00:00 2001 From: Kevin McKinney Date: Thu, 22 Nov 2012 14:48:53 -0500 Subject: [PATCH] Staging: bcm: Remove typedef for stGPIOInfo and call directly. This patch removes typedef for stGPIOInfo, and changes the name of the struct to bcm_gpio_info. In addition, any calls to typedefs GPIO_INFO, or *PGPIO_INFO 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 cb0c0c9a16a4..7250c48ddfde 100644 --- a/drivers/staging/bcm/Bcmchar.c +++ b/drivers/staging/bcm/Bcmchar.c @@ -401,8 +401,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) UINT value = 0; UINT uiBit = 0; UINT uiOperation = 0; + struct bcm_gpio_info gpio_info = {0}; - GPIO_INFO gpio_info = {0}; if ((Adapter->IdleMode == TRUE) || (Adapter->bShutStatus == TRUE) || (Adapter->bPreparingForLowPowerMode == TRUE)) { @@ -518,7 +518,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) case IOCTL_BCM_GPIO_STATUS_REQUEST: { ULONG uiBit = 0; UCHAR ucRead[4]; - GPIO_INFO gpio_info = {0}; + struct bcm_gpio_info gpio_info = {0}; if ((Adapter->IdleMode == TRUE) || (Adapter->bShutStatus == TRUE) || diff --git a/drivers/staging/bcm/Ioctl.h b/drivers/staging/bcm/Ioctl.h index ddaf789dc273..440bff5df6ad 100644 --- a/drivers/staging/bcm/Ioctl.h +++ b/drivers/staging/bcm/Ioctl.h @@ -19,10 +19,10 @@ struct bcm_ioctl_buffer { unsigned long OutputLength; } __packed; -typedef struct stGPIOInfo { +struct bcm_gpio_info { unsigned int uiGpioNumber; /* valid numbers 0-15 */ unsigned int uiGpioValue; /* 1 set ; 0 not set */ -} __packed GPIO_INFO, *PGPIO_INFO; +} __packed; struct bcm_user_thread_req { /* 0->Inactivate LED thread. */ -- 2.20.1