Commit 63df64a2 authored by Kevin McKinney's avatar Kevin McKinney Committed by Greg Kroah-Hartman
Browse files

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: default avatarKevin McKinney <klmckinney1@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9e91edb7

drivers/staging/bcm/Bcmchar.c

+3 −3
Original line number Diff line number Diff line
@@ -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) ||

drivers/staging/bcm/Ioctl.h

+2 −2
Original line number Diff line number Diff line
@@ -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 */