diff options
| author | Kevin McKinney <klmckinney1@gmail.com> | 2012-11-22 14:48:46 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-26 16:05:22 -0800 |
| commit | 3712af0c0d6889408c17138671814ab315ff53ce (patch) | |
| tree | 7d1da607b6d4656f3a9622f35d2500798d4bf826 /drivers/staging/bcm | |
| parent | 98e341d3ddb1eec46f7164a7a895149c671d10f5 (diff) | |
Staging: bcm: Remove typedef for _NVM_READWRITE and call directly.
This patch removes typedef for _NVM_READWRITE,
and changes the name of the struct to
bcm_nvm_readwrite. In addition, any calls to
typedefs NVM_READWRITE, or *PNVM_READWRITE
are changed to call the struct directly.
Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/bcm')
| -rw-r--r-- | drivers/staging/bcm/Bcmchar.c | 8 | ||||
| -rw-r--r-- | drivers/staging/bcm/Ioctl.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c index 5b407d66e1d..2f03c0de697 100644 --- a/drivers/staging/bcm/Bcmchar.c +++ b/drivers/staging/bcm/Bcmchar.c @@ -1262,7 +1262,7 @@ cntrlEnd: case IOCTL_BCM_NVM_READ: case IOCTL_BCM_NVM_WRITE: { - NVM_READWRITE stNVMReadWrite; + struct bcm_nvm_readwrite stNVMReadWrite; PUCHAR pReadData = NULL; ULONG ulDSDMagicNumInUsrBuff = 0; struct timeval tv0, tv1; @@ -1289,7 +1289,7 @@ cntrlEnd: if (copy_from_user(&stNVMReadWrite, (IOCTL_BCM_NVM_READ == cmd) ? IoBuffer.OutputBuffer : IoBuffer.InputBuffer, - sizeof(NVM_READWRITE))) + sizeof(struct bcm_nvm_readwrite))) return -EFAULT; /* @@ -1842,7 +1842,7 @@ cntrlEnd: break; case IOCTL_BCM_NVM_RAW_READ: { - NVM_READWRITE stNVMRead; + struct bcm_nvm_readwrite stNVMRead; INT NOB ; INT BuffSize ; INT ReadOffset = 0; @@ -1861,7 +1861,7 @@ cntrlEnd: return -EFAULT; } - if (copy_from_user(&stNVMRead, IoBuffer.OutputBuffer, sizeof(NVM_READWRITE))) + if (copy_from_user(&stNVMRead, IoBuffer.OutputBuffer, sizeof(struct bcm_nvm_readwrite))) return -EFAULT; NOB = stNVMRead.uiNumBytes; diff --git a/drivers/staging/bcm/Ioctl.h b/drivers/staging/bcm/Ioctl.h index 4a32e8f251e..ec51c8bc7e7 100644 --- a/drivers/staging/bcm/Ioctl.h +++ b/drivers/staging/bcm/Ioctl.h @@ -116,12 +116,12 @@ typedef struct _DEVICE_DRIVER_INFO { unsigned int u32Reserved[10]; } DEVICE_DRIVER_INFO; -typedef struct _NVM_READWRITE { +struct bcm_nvm_readwrite { void __user *pBuffer; uint32_t uiOffset; uint32_t uiNumBytes; bool bVerify; -} NVM_READWRITE, *PNVM_READWRITE; +}; struct bcm_bulk_wrm_buffer { unsigned long Register; |