openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This patch removes typedef for bulkwrmbuffer,
and changes the name of the struct to
bcm_bulk_wrm_buffer. In addition, any calls to
typedefs BULKWRM_BUFFER, or *PBULKWRM_BUFFER
are changed to call the struct directly.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Kevin McKinney 2012-11-22 14:48:45 -05:00 committed by Greg Kroah-Hartman
parent b1206c091b
commit 98e341d3dd
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/bcm/Bcmchar.c
View File

@ -1118,7 +1118,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
break; break;
case IOCTL_BCM_BULK_WRM: { case IOCTL_BCM_BULK_WRM: {
PBULKWRM_BUFFER pBulkBuffer; struct bcm_bulk_wrm_buffer *pBulkBuffer;
UINT uiTempVar = 0; UINT uiTempVar = 0;
PCHAR pvBuffer = NULL; PCHAR pvBuffer = NULL;
@ -1143,7 +1143,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
if (IS_ERR(pvBuffer)) if (IS_ERR(pvBuffer))
return PTR_ERR(pvBuffer); return PTR_ERR(pvBuffer);
pBulkBuffer = (PBULKWRM_BUFFER)pvBuffer; pBulkBuffer = (struct bcm_bulk_wrm_buffer *)pvBuffer;
if (((ULONG)pBulkBuffer->Register & 0x0F000000) != 0x0F000000 || if (((ULONG)pBulkBuffer->Register & 0x0F000000) != 0x0F000000 ||
((ULONG)pBulkBuffer->Register & 0x3)) { ((ULONG)pBulkBuffer->Register & 0x3)) {

5
drivers/staging/bcm/Ioctl.h
View File

@ -123,12 +123,11 @@ typedef struct _NVM_READWRITE {
bool bVerify; bool bVerify;
} NVM_READWRITE, *PNVM_READWRITE; } NVM_READWRITE, *PNVM_READWRITE;
typedef struct bulkwrmbuffer { struct bcm_bulk_wrm_buffer {
unsigned long Register; unsigned long Register;
unsigned long SwapEndian; unsigned long SwapEndian;
unsigned long Values[1]; unsigned long Values[1];
};
} BULKWRM_BUFFER, *PBULKWRM_BUFFER;
typedef enum _FLASH2X_SECTION_VAL { typedef enum _FLASH2X_SECTION_VAL {
NO_SECTION_VAL = 0, /* no section is chosen when absolute offset is given for RD/WR */ NO_SECTION_VAL = 0, /* no section is chosen when absolute offset is given for RD/WR */