mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-17 22:41:25 +00:00
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>
This commit is contained in:
parent
38414104db
commit
af72c61794
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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,
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user