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

This patch removes typedef for _FLASH2X_READWRITE,
and changes the name of the struct to
bcm_flash2x_readwrite. In addition, any calls to
typedefs FLASH2X_READWRITE, or *PFLASH2X_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>

diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 2f03c0de69711009e9633a038302dd67d55256af..cb26e581ba673ec8df541fa9e7bab8e5c00b5837 100644 (file)
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -1404,7 +1404,7 @@ cntrlEnd:
        }
 
        case IOCTL_BCM_FLASH2X_SECTION_READ: {
-               FLASH2X_READWRITE sFlash2xRead = {0};
+               struct bcm_flash2x_readwrite sFlash2xRead = {0};
                PUCHAR pReadBuff = NULL ;
                UINT NOB = 0;
                UINT BuffSize = 0;
@@ -1422,7 +1422,7 @@ cntrlEnd:
                        return -EFAULT;
 
                /* Reading FLASH 2.x READ structure */
-               if (copy_from_user(&sFlash2xRead, IoBuffer.InputBuffer, sizeof(FLASH2X_READWRITE)))
+               if (copy_from_user(&sFlash2xRead, IoBuffer.InputBuffer, sizeof(struct bcm_flash2x_readwrite)))
                        return -EFAULT;
 
                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "\nsFlash2xRead.Section :%x", sFlash2xRead.Section);
@@ -1495,7 +1495,7 @@ cntrlEnd:
        break;
 
        case IOCTL_BCM_FLASH2X_SECTION_WRITE: {
-               FLASH2X_READWRITE sFlash2xWrite = {0};
+               struct bcm_flash2x_readwrite sFlash2xWrite = {0};
                PUCHAR pWriteBuff;
                void __user *InputAddr;
                UINT NOB = 0;
@@ -1517,7 +1517,7 @@ cntrlEnd:
                        return -EFAULT;
 
                /* Reading FLASH 2.x READ structure */
-               if (copy_from_user(&sFlash2xWrite, IoBuffer.InputBuffer, sizeof(FLASH2X_READWRITE)))
+               if (copy_from_user(&sFlash2xWrite, IoBuffer.InputBuffer, sizeof(struct bcm_flash2x_readwrite)))
                        return -EFAULT;
 
                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "\nsFlash2xRead.Section :%x", sFlash2xWrite.Section);

diff --git a/drivers/staging/bcm/Ioctl.h b/drivers/staging/bcm/Ioctl.h
index ec51c8bc7e79a0d5031923846756e40b5a726ebe..ce80181a8cfb4b38f28a60aac0a114185b2e1f09 100644 (file)
--- a/drivers/staging/bcm/Ioctl.h
+++ b/drivers/staging/bcm/Ioctl.h
@@ -151,13 +151,13 @@ typedef enum _FLASH2X_SECTION_VAL {
 /*
  * Structure used for READ/WRITE Flash Map2.x
  */
-typedef struct _FLASH2X_READWRITE {
+struct bcm_flash2x_readwrite {
        FLASH2X_SECTION_VAL Section; /* which section has to be read/written */
        u32 offset;          /* Offset within Section. */
        u32 numOfBytes;      /* NOB from the offset */
        u32 bVerify;
        void __user *pDataBuff;      /* Buffer for reading/writing */
-} FLASH2X_READWRITE, *PFLASH2X_READWRITE;
+};
 
 /*
  * This structure is used for coping one section to other.

diff --git a/drivers/staging/bcm/Prototypes.h b/drivers/staging/bcm/Prototypes.h
index 00723589c08e9f3a3bd990c94c2fd363bd4234b5..821fc8b2d2c1ce5bbe3b1a313abe99ab79f40534 100644 (file)
--- a/drivers/staging/bcm/Prototypes.h
+++ b/drivers/staging/bcm/Prototypes.h
@@ -189,7 +189,7 @@ INT BcmDeAllocFlashCSStructure(struct bcm_mini_adapter *psAdapter);
 INT BcmCopyISO(struct bcm_mini_adapter *Adapter, struct bcm_flash2x_copy_section sCopySectStrut);
 INT BcmFlash2xCorruptSig(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal);
 INT BcmFlash2xWriteSig(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eFlashSectionVal);
-INT    validateFlash2xReadWrite(struct bcm_mini_adapter *Adapter, PFLASH2X_READWRITE psFlash2xReadWrite);
+INT    validateFlash2xReadWrite(struct bcm_mini_adapter *Adapter, struct bcm_flash2x_readwrite *psFlash2xReadWrite);
 INT IsFlash2x(struct bcm_mini_adapter *Adapter);
 INT    BcmCopySection(struct bcm_mini_adapter *Adapter,
                                                FLASH2X_SECTION_VAL SrcSection,

diff --git a/drivers/staging/bcm/nvm.c b/drivers/staging/bcm/nvm.c
index 8d3d759e4649e333590e4094d6f23a0740817828..e9d4985d7859555d4c65e56bfcb7efeb95dae015 100644 (file)
--- a/drivers/staging/bcm/nvm.c
+++ b/drivers/staging/bcm/nvm.c
@@ -3901,7 +3901,7 @@ int BcmFlash2xWriteSig(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eFl
  * Return values:-Return TRUE is request is valid else FALSE.
  */
 
-int validateFlash2xReadWrite(struct bcm_mini_adapter *Adapter, PFLASH2X_READWRITE psFlash2xReadWrite)
+int validateFlash2xReadWrite(struct bcm_mini_adapter *Adapter, struct bcm_flash2x_readwrite *psFlash2xReadWrite)
 {
        unsigned int uiNumOfBytes = 0;
        unsigned int uiSectStartOffset = 0;