Skip to content

Commit

Permalink
Staging: bcm: Remove typedef for bulkwrmbuffer and call directly.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Kevin McKinney authored and Greg Kroah-Hartman committed Nov 27, 2012
1 parent b1206c0 commit 98e341d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
4 changes: 2 additions & 2 deletions drivers/staging/bcm/Bcmchar.c
Original file line number Diff line number Diff line change
Expand Up @@ -1118,7 +1118,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
break;

case IOCTL_BCM_BULK_WRM: {
PBULKWRM_BUFFER pBulkBuffer;
struct bcm_bulk_wrm_buffer *pBulkBuffer;
UINT uiTempVar = 0;
PCHAR pvBuffer = NULL;

Expand All @@ -1143,7 +1143,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
if (IS_ERR(pvBuffer))
return PTR_ERR(pvBuffer);

pBulkBuffer = (PBULKWRM_BUFFER)pvBuffer;
pBulkBuffer = (struct bcm_bulk_wrm_buffer *)pvBuffer;

if (((ULONG)pBulkBuffer->Register & 0x0F000000) != 0x0F000000 ||
((ULONG)pBulkBuffer->Register & 0x3)) {
Expand Down
5 changes: 2 additions & 3 deletions drivers/staging/bcm/Ioctl.h
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,11 @@ typedef struct _NVM_READWRITE {
bool bVerify;
} NVM_READWRITE, *PNVM_READWRITE;

typedef struct bulkwrmbuffer {
struct bcm_bulk_wrm_buffer {
unsigned long Register;
unsigned long SwapEndian;
unsigned long Values[1];

} BULKWRM_BUFFER, *PBULKWRM_BUFFER;
};

typedef enum _FLASH2X_SECTION_VAL {
NO_SECTION_VAL = 0, /* no section is chosen when absolute offset is given for RD/WR */
Expand Down

0 comments on commit 98e341d

Please sign in to comment.