From ff31e745cdec6fac43a8bbfc3b978937da75a2a4 Mon Sep 17 00:00:00 2001 From: Kevin McKinney Date: Thu, 22 Nov 2012 14:48:48 -0500 Subject: [PATCH] Staging: bcm: Remove typedef for _DEVICE_DRIVER_INFO and call directly. This patch removes typedef for _DEVICE_DRIVER_INFO, and changes the name of the struct to bcm_driver_info. In addition, any calls to typedefs DEVICE_DRIVER_INFO are changed to call the struct directly. Signed-off-by: Kevin McKinney Signed-off-by: Greg Kroah-Hartman --- drivers/staging/bcm/Bcmchar.c | 2 +- drivers/staging/bcm/Ioctl.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c index cb26e581ba67..3485a86d9fc9 100644 --- a/drivers/staging/bcm/Bcmchar.c +++ b/drivers/staging/bcm/Bcmchar.c @@ -1955,7 +1955,7 @@ cntrlEnd: break; case IOCTL_BCM_GET_DEVICE_DRIVER_INFO: { - DEVICE_DRIVER_INFO DevInfo; + struct bcm_driver_info DevInfo; BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Called IOCTL_BCM_GET_DEVICE_DRIVER_INFO\n"); diff --git a/drivers/staging/bcm/Ioctl.h b/drivers/staging/bcm/Ioctl.h index ce80181a8cfb..0d1f57abe579 100644 --- a/drivers/staging/bcm/Ioctl.h +++ b/drivers/staging/bcm/Ioctl.h @@ -107,14 +107,14 @@ typedef enum _BCM_INTERFACE_TYPE { BCM_PCMCIA } BCM_INTERFACE_TYPE; -typedef struct _DEVICE_DRIVER_INFO { +struct bcm_driver_info { NVM_TYPE u32NVMType; unsigned int MaxRDMBufferSize; BCM_INTERFACE_TYPE u32InterfaceType; unsigned int u32DSDStartOffset; unsigned int u32RxAlignmentCorrection; unsigned int u32Reserved[10]; -} DEVICE_DRIVER_INFO; +}; struct bcm_nvm_readwrite { void __user *pBuffer; -- 2.30.2