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>

diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 1f8495daf31fb49b11770f8107ab504a15f45987..5b407d66e1df942cb9ace0abc5b1816e9548c57f 100644 (file)
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -1118,7 +1118,7 @@ cntrlEnd:
                break;
 
        case IOCTL_BCM_BULK_WRM: {
-               PBULKWRM_BUFFER pBulkBuffer;
+               struct bcm_bulk_wrm_buffer *pBulkBuffer;
                UINT uiTempVar = 0;
                PCHAR pvBuffer = NULL;
 
@@ -1143,7 +1143,7 @@ cntrlEnd:
                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)) {

diff --git a/drivers/staging/bcm/Ioctl.h b/drivers/staging/bcm/Ioctl.h
index a465d05f99ebb47307a104153c0caa3ae319e468..4a32e8f251eb27e6f319ab5d309ca9986f54a057 100644 (file)
--- a/drivers/staging/bcm/Ioctl.h
+++ b/drivers/staging/bcm/Ioctl.h
@@ -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 */