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

This patch removes typedef for eNVM_TYPE, and changes
the name of the enum to bcm_nvm_type. In addition,
any calls to enum "NVM_TYPE" are changed to call
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 91367ce1cb31e653d03884b7b86f480a9ba5ee2c..ade7bfd9cde3cb4ffc7d6832cda4f8bda26fb90d 100644 (file)
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -345,7 +345,7 @@ struct bcm_mini_adapter {
        struct bcm_fragmented_packet_info astFragmentedPktClassifierTable[MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES];
        atomic_t                uiMBupdate;
        UINT32                  PmuMode;
-       NVM_TYPE                eNVMType;
+       enum bcm_nvm_type       eNVMType;
        UINT                    uiSectorSize;
        UINT                    uiSectorSizeInCFG;
        BOOLEAN                 bSectorSizeOverride;

diff --git a/drivers/staging/bcm/Ioctl.h b/drivers/staging/bcm/Ioctl.h
index 8650d132d2b16124ba36a009f3873a8a5c46d370..e253c080a787e6fc4c39be37ec6a12618723b794 100644 (file)
--- a/drivers/staging/bcm/Ioctl.h
+++ b/drivers/staging/bcm/Ioctl.h
@@ -108,7 +108,7 @@ enum bcm_interface_type {
 };
 
 struct bcm_driver_info {
-       NVM_TYPE        u32NVMType;
+       enum bcm_nvm_type       u32NVMType;
        unsigned int            MaxRDMBufferSize;
        enum bcm_interface_type u32InterfaceType;
        unsigned int            u32DSDStartOffset;

diff --git a/drivers/staging/bcm/Macros.h b/drivers/staging/bcm/Macros.h
index 75926433289e53073d3e9dd4590077ffa2027305..015e094d89ea79833f44c1fbbaf0bcea9587259a 100644 (file)
--- a/drivers/staging/bcm/Macros.h
+++ b/drivers/staging/bcm/Macros.h
@@ -324,12 +324,12 @@ typedef enum _E_PHS_DSC_ACTION {
 #define HPM_CONFIG_MSW    0x0F000D58
 
 #define T3B 0xbece0310
-typedef enum eNVM_TYPE {
+enum bcm_nvm_type {
        NVM_AUTODETECT = 0,
        NVM_EEPROM,
        NVM_FLASH,
        NVM_UNKNOWN
-} NVM_TYPE;
+};
 
 enum bcm_pmu_modes {
        HYBRID_MODE_7C  = 0,

diff --git a/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c
index 21b739af60ba586c424f0d612574c16f57c74206..b5c2c4c15f926dc1d1dde8b7615099964bb56739 100644 (file)
--- a/drivers/staging/bcm/Misc.c
+++ b/drivers/staging/bcm/Misc.c
@@ -1134,7 +1134,7 @@ void beceem_parse_target_struct(struct bcm_mini_adapter *Adapter)
 
        uiEEPROMFlag = ntohl(Adapter->pstargetparams->m_u32EEPROMFlag);
        pr_info(DRV_NAME ": uiEEPROMFlag  : 0x%X\n", uiEEPROMFlag);
-       Adapter->eNVMType = (NVM_TYPE)((uiEEPROMFlag>>4)&0x3);
+       Adapter->eNVMType = (enum bcm_nvm_type)((uiEEPROMFlag>>4)&0x3);
        Adapter->bStatusWrite = (uiEEPROMFlag>>6)&0x1;
        Adapter->uiSectorSizeInCFG = 1024*(0xFFFF & ntohl(Adapter->pstargetparams->HostDrvrConfig4));
        Adapter->bSectorSizeOverride = (bool) ((ntohl(Adapter->pstargetparams->HostDrvrConfig4))>>16)&0x1;

diff --git a/drivers/staging/bcm/nvm.c b/drivers/staging/bcm/nvm.c
index 8960a18232eafbbb7bf3b3fcc6e82e9d77e7faa9..428375395f8894cd2ab7bb2548716bacf8aa31b1 100644 (file)
--- a/drivers/staging/bcm/nvm.c
+++ b/drivers/staging/bcm/nvm.c
@@ -12,7 +12,7 @@ static unsigned int BcmGetFlashSectorSize(struct bcm_mini_adapter *Adapter, unsi
 static VOID BcmValidateNvmType(struct bcm_mini_adapter *Adapter);
 static int BcmGetNvmSize(struct bcm_mini_adapter *Adapter);
 static unsigned int BcmGetFlashSize(struct bcm_mini_adapter *Adapter);
-static NVM_TYPE BcmGetNvmType(struct bcm_mini_adapter *Adapter);
+static enum bcm_nvm_type BcmGetNvmType(struct bcm_mini_adapter *Adapter);
 
 static int BcmGetSectionValEndOffset(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val eFlash2xSectionVal);
 
@@ -2629,7 +2629,7 @@ static int BcmGetFlashCSInfo(struct bcm_mini_adapter *Adapter)
  *
  */
 
-static NVM_TYPE BcmGetNvmType(struct bcm_mini_adapter *Adapter)
+static enum bcm_nvm_type BcmGetNvmType(struct bcm_mini_adapter *Adapter)
 {
        unsigned int uiData = 0;