From: Kevin McKinney <klmckinney1@gmail.com>
Date: Thu, 22 Nov 2012 19:48:39 +0000 (-0500)
Subject: Staging: bcm: Remove typedef for stGPIOMultiMode and call directly.
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=9e91edb71d899818ca769aa372372a8ed998357a;p=deliverable%2Flinux.git

Staging: bcm: Remove typedef for stGPIOMultiMode and call directly.

This patch removes typedef for
stGPIOMultiMode, and changes the name of the
struct to bcm_gpio_multi_mode. In addition,
any calls to typedefs GPIO_MULTI_MODE, or
*PGPIO_MULTI_MODE are changed to call the
struct directly.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 31a1a2ba7ef1..73ed3d60d4fc 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -636,8 +636,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 
 	case IOCTL_BCM_GPIO_MODE_REQUEST: {
 		UCHAR ucResetValue[4];
-		GPIO_MULTI_MODE gpio_multi_mode[MAX_IDX];
-		PGPIO_MULTI_MODE pgpio_multi_mode = (PGPIO_MULTI_MODE)gpio_multi_mode;
+		struct bcm_gpio_multi_mode gpio_multi_mode[MAX_IDX];
+		struct bcm_gpio_multi_mode *pgpio_multi_mode = (struct bcm_gpio_multi_mode *)gpio_multi_mode;
 
 		if ((Adapter->IdleMode == TRUE) ||
 			(Adapter->bShutStatus == TRUE) ||
diff --git a/drivers/staging/bcm/Ioctl.h b/drivers/staging/bcm/Ioctl.h
index 05ef61dce8a6..f5d9b4af49f7 100644
--- a/drivers/staging/bcm/Ioctl.h
+++ b/drivers/staging/bcm/Ioctl.h
@@ -225,9 +225,9 @@ typedef struct stGPIOMultiInfo {
 	unsigned int uiGPIOValue;   /* 0 or 1; value to be set when command is 1. */
 } __packed GPIO_MULTI_INFO, *PGPIO_MULTI_INFO;
 
-typedef struct stGPIOMultiMode {
+struct bcm_gpio_multi_mode {
 	unsigned int uiGPIOMode;    /* 1 for OUT mode, 0 for IN mode */
 	unsigned int uiGPIOMask;    /* GPIO mask to set mode */
-} __packed GPIO_MULTI_MODE, *PGPIO_MULTI_MODE;
+} __packed;
 
 #endif