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

This patch removes typedef for _FLASH_CS_INFO, and
changes the name of the struct to bcm_flash_cs_info.
In addition, any calls to typedefs FLASH_CS_INFO, or
*PFLASH_CS_INFO 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/Adapter.h b/drivers/staging/bcm/Adapter.h
index d002aea92039f7f7c9341e54a26cd0453c672a33..1f7005d0b6592e6ab2fc203d306633bb37adb010 100644 (file)
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -367,7 +367,7 @@ struct bcm_mini_adapter {
 
        /*      BOOLEAN                         InterfaceUpStatus; */
        struct bcm_flash2x_cs_info *psFlash2xCSInfo;
-       PFLASH_CS_INFO          psFlashCSInfo;
+       struct bcm_flash_cs_info *psFlashCSInfo;
        struct bcm_flash2x_vendor_info *psFlash2xVendorInfo;
        UINT                    uiFlashBaseAdd; /* Flash start address */
        UINT                    uiActiveISOOffset; /* Active ISO offset chosen before f/w download */

diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 300d60a5866e92e3cb123f8792db6a69e00ac19c..fd7c974aff32e529b88d9772c57b3c6dcf020815 100644 (file)
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -1789,7 +1789,7 @@ cntrlEnd:
                        if (copy_to_user(IoBuffer.OutputBuffer, Adapter->psFlash2xCSInfo, sizeof(struct bcm_flash2x_cs_info)))
                                return -EFAULT;
                } else {
-                       if (IoBuffer.OutputLength < sizeof(FLASH_CS_INFO))
+                       if (IoBuffer.OutputLength < sizeof(struct bcm_flash_cs_info))
                                return -EINVAL;
 
                        if (copy_to_user(IoBuffer.OutputBuffer, Adapter->psFlashCSInfo, sizeof(struct bcm_flash2x_cs_info)))

diff --git a/drivers/staging/bcm/nvm.c b/drivers/staging/bcm/nvm.c
index 2c3944c8e64f0ec197464cdc42fa8a138f28552d..8960a18232eafbbb7bf3b3fcc6e82e9d77e7faa9 100644 (file)
--- a/drivers/staging/bcm/nvm.c
+++ b/drivers/staging/bcm/nvm.c
@@ -1978,7 +1978,7 @@ int BeceemNVMWrite(struct bcm_mini_adapter *Adapter,
 int BcmUpdateSectorSize(struct bcm_mini_adapter *Adapter, unsigned int uiSectorSize)
 {
        int Status = -1;
-       FLASH_CS_INFO sFlashCsInfo = {0};
+       struct bcm_flash_cs_info sFlashCsInfo = {0};
        unsigned int uiTemp = 0;
        unsigned int uiSectorSig = 0;
        unsigned int uiCurrentSectorSize = 0;
@@ -2228,7 +2228,7 @@ int BcmAllocFlashCSStructure(struct bcm_mini_adapter *psAdapter)
                BCM_DEBUG_PRINT(psAdapter, DBG_TYPE_PRINTK, 0, 0, "Adapter structure point is NULL");
                return -EINVAL;
        }
-       psAdapter->psFlashCSInfo = (PFLASH_CS_INFO)kzalloc(sizeof(FLASH_CS_INFO), GFP_KERNEL);
+       psAdapter->psFlashCSInfo = (struct bcm_flash_cs_info *)kzalloc(sizeof(struct bcm_flash_cs_info), GFP_KERNEL);
        if (psAdapter->psFlashCSInfo == NULL) {
                BCM_DEBUG_PRINT(psAdapter, DBG_TYPE_PRINTK, 0, 0, "Can't Allocate memory for Flash 1.x");
                return -ENOMEM;
@@ -2381,7 +2381,7 @@ static int ConvertEndianOf2XCSStructure(struct bcm_flash2x_cs_info *psFlash2xCSI
        return STATUS_SUCCESS;
 }
 
-static int ConvertEndianOfCSStructure(PFLASH_CS_INFO psFlashCSInfo)
+static int ConvertEndianOfCSStructure(struct bcm_flash_cs_info *psFlashCSInfo)
 {
        /* unsigned int Index = 0; */
        psFlashCSInfo->MagicNumber                              = ntohl(psFlashCSInfo->MagicNumber);
@@ -2509,7 +2509,7 @@ static VOID UpdateVendorInfo(struct bcm_mini_adapter *Adapter)
 
 static int BcmGetFlashCSInfo(struct bcm_mini_adapter *Adapter)
 {
-       /* FLASH_CS_INFO sFlashCsInfo = {0}; */
+       /* struct bcm_flash_cs_info sFlashCsInfo = {0}; */
 
        #if !defined(BCM_SHM_INTERFACE) || defined(FLASH_DIRECT_ACCESS)
                unsigned int value;
@@ -2522,7 +2522,7 @@ static int BcmGetFlashCSInfo(struct bcm_mini_adapter *Adapter)
 
        Adapter->uiFlashBaseAdd = 0;
        Adapter->ulFlashCalStart = 0;
-       memset(Adapter->psFlashCSInfo, 0 , sizeof(FLASH_CS_INFO));
+       memset(Adapter->psFlashCSInfo, 0 , sizeof(struct bcm_flash_cs_info));
        memset(Adapter->psFlash2xCSInfo, 0 , sizeof(struct bcm_flash2x_cs_info));
 
        if (!Adapter->bDDRInitDone) {
@@ -2551,7 +2551,7 @@ static int BcmGetFlashCSInfo(struct bcm_mini_adapter *Adapter)
        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "FLASH LAYOUT MAJOR VERSION :%X", uiFlashLayoutMajorVersion);
 
        if (uiFlashLayoutMajorVersion < FLASH_2X_MAJOR_NUMBER) {
-               BeceemFlashBulkRead(Adapter, (PUINT)Adapter->psFlashCSInfo, Adapter->ulFlashControlSectionStart, sizeof(FLASH_CS_INFO));
+               BeceemFlashBulkRead(Adapter, (PUINT)Adapter->psFlashCSInfo, Adapter->ulFlashControlSectionStart, sizeof(struct bcm_flash_cs_info));
                ConvertEndianOfCSStructure(Adapter->psFlashCSInfo);
                Adapter->ulFlashCalStart = (Adapter->psFlashCSInfo->OffsetFromZeroForCalibrationStart);
 

diff --git a/drivers/staging/bcm/nvm.h b/drivers/staging/bcm/nvm.h
index e64a6208725723916d5ad2ba799261ab42410545..b262a1110b11e45e4da73acb9ee2d3ad7f10cbe2 100644 (file)
--- a/drivers/staging/bcm/nvm.h
+++ b/drivers/staging/bcm/nvm.h
@@ -26,7 +26,7 @@ typedef struct _FLASH_SECTOR_INFO {
        unsigned int uiSectorSize;
 } FLASH_SECTOR_INFO, *PFLASH_SECTOR_INFO;
 
-typedef struct _FLASH_CS_INFO {
+struct bcm_flash_cs_info {
        u32 MagicNumber;
        /* let the magic number be 0xBECE-F1A5 - F1A5 for "flas-h" */
        u32 FlashLayoutVersion;
@@ -53,7 +53,7 @@ typedef struct _FLASH_CS_INFO {
        u32 IsCDLessDeviceBootSig;
        /* MSC Timeout after reset to switch from MSC to NW Mode */
        u32 MassStorageTimeout;
-} FLASH_CS_INFO, *PFLASH_CS_INFO;
+};
 
 #define FLASH2X_TOTAL_SIZE     (64 * 1024 * 1024)
 #define DEFAULT_SECTOR_SIZE    (64 * 1024)