From: Kevin McKinney Date: Thu, 22 Nov 2012 19:48:49 +0000 (-0500) Subject: Staging: bcm: Remove typedef for _BCM_INTERFACE_TYPE and reference directly. X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=0becebb1f845ec30e017b55f32f89e1de7bf5651;p=deliverable%2Flinux.git Staging: bcm: Remove typedef for _BCM_INTERFACE_TYPE and reference directly. This patch removes typedef for _BCM_INTERFACE_TYPE, and changes the name of the enum to bcm_interface_type. In addition, any calls to typedefs BCM_INTERFACE_TYPE are changed to reference the enum directly. Signed-off-by: Kevin McKinney Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/bcm/Ioctl.h b/drivers/staging/bcm/Ioctl.h index 0d1f57abe579..f9db28acf351 100644 --- a/drivers/staging/bcm/Ioctl.h +++ b/drivers/staging/bcm/Ioctl.h @@ -99,18 +99,18 @@ typedef struct stUserThreadReq { #define IOCTL_BCM_GPIO_MULTI_REQUEST _IOW(BCM_IOCTL, 0x82D, IOCTL_BUFFER) #define IOCTL_BCM_GPIO_MODE_REQUEST _IOW(BCM_IOCTL, 0x82E, IOCTL_BUFFER) -typedef enum _BCM_INTERFACE_TYPE { +enum bcm_interface_type { BCM_MII, BCM_CARDBUS, BCM_USB, BCM_SDIO, BCM_PCMCIA -} BCM_INTERFACE_TYPE; +}; struct bcm_driver_info { NVM_TYPE u32NVMType; unsigned int MaxRDMBufferSize; - BCM_INTERFACE_TYPE u32InterfaceType; + enum bcm_interface_type u32InterfaceType; unsigned int u32DSDStartOffset; unsigned int u32RxAlignmentCorrection; unsigned int u32Reserved[10];