diff options
| author |   Larry Finger <Larry.Finger@lwfinger.net> | 2011-07-19 18:13:46 -0500 |
|---|---|---|
| committer | Larry Finger <Larry.Finger@lwfinger.net> | 2011-08-24 10:48:08 -0500 |
| commit | afa087ddd80ff5d1ebc0080de18935be723ff3b7 (patch) | |
| tree | c23d9a9c4cc849270b27d811cc8c64370bb809e0 | |
| parent | staging: rtl8192e: Convert typedef SwChnlCmdID to enum sw_chnl_cmd_id (diff) | |
| download | linux-dev-afa087ddd80ff5d1ebc0080de18935be723ff3b7.tar.xz linux-dev-afa087ddd80ff5d1ebc0080de18935be723ff3b7.zip | |
staging: rtl8192e: Convert typedef HW90_BLOCK_E to enum hw90_block
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
| -rw-r--r-- | drivers/staging/rtl8192e/r8192E_phy.c | 6 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/r8192E_phy.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/r8192E_phy.c index 1717ca31dd0a..0a64658abd52 100644 --- a/drivers/staging/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/r8192E_phy.c @@ -510,7 +510,7 @@ void rtl8192_InitBBRFRegDef(struct net_device* dev) priv->PHYRegDef[RF90_PATH_D].rfLSSIReadBack = rFPGA0_XD_LSSIReadBack; } -bool rtl8192_phy_checkBBAndRF(struct net_device* dev, HW90_BLOCK_E CheckBlock, RF90_RADIO_PATH_E eRFPath) +bool rtl8192_phy_checkBBAndRF(struct net_device* dev, enum hw90_block CheckBlock, RF90_RADIO_PATH_E eRFPath) { bool ret = true; u32 i, CheckTimes = 4, dwRegRead = 0; @@ -576,9 +576,9 @@ bool rtl8192_BB_Config_ParaFile(struct net_device* dev) dwRegValue = read_nic_dword(dev, CPU_GEN); write_nic_dword(dev, CPU_GEN, (dwRegValue&(~CPU_GEN_BB_RST))); - for (eCheckItem=(HW90_BLOCK_E)HW90_BLOCK_PHY0; eCheckItem<=HW90_BLOCK_PHY1; eCheckItem++) + for (eCheckItem=(enum hw90_block)HW90_BLOCK_PHY0; eCheckItem<=HW90_BLOCK_PHY1; eCheckItem++) { - rtStatus = rtl8192_phy_checkBBAndRF(dev, (HW90_BLOCK_E)eCheckItem, (RF90_RADIO_PATH_E)0); + rtStatus = rtl8192_phy_checkBBAndRF(dev, (enum hw90_block)eCheckItem, (RF90_RADIO_PATH_E)0); if (rtStatus != true) { RT_TRACE((COMP_ERR | COMP_PHY), "PHY_RF8256_Config():Check PHY%d Fail!!\n", eCheckItem-1); diff --git a/drivers/staging/rtl8192e/r8192E_phy.h b/drivers/staging/rtl8192e/r8192E_phy.h index e214ee7b1408..9f5560b8c1f6 100644 --- a/drivers/staging/rtl8192e/r8192E_phy.h +++ b/drivers/staging/rtl8192e/r8192E_phy.h @@ -73,13 +73,13 @@ extern u32 rtl819XRadioB_Array[]; extern u32 rtl819XRadioC_Array[]; extern u32 rtl819XRadioD_Array[]; -typedef enum _HW90_BLOCK_E { +enum hw90_block { HW90_BLOCK_MAC = 0, HW90_BLOCK_PHY0 = 1, HW90_BLOCK_PHY1 = 2, HW90_BLOCK_RF = 3, HW90_BLOCK_MAXIMUM = 4, -} HW90_BLOCK_E, *PHW90_BLOCK_E; +}; typedef enum _RF90_RADIO_PATH_E{ RF90_PATH_A = 0, @@ -104,7 +104,7 @@ extern void rtl8192_phy_SetRFReg(struct net_device* dev, RF90_RADIO_PATH_E eRFPa extern u32 rtl8192_phy_QueryRFReg(struct net_device* dev, RF90_RADIO_PATH_E eRFPath, u32 RegAddr, u32 BitMask); extern void rtl8192_phy_configmac(struct net_device* dev); extern void rtl8192_phyConfigBB(struct net_device* dev, u8 ConfigType); -extern bool rtl8192_phy_checkBBAndRF(struct net_device* dev, HW90_BLOCK_E CheckBlock, RF90_RADIO_PATH_E eRFPath); +extern bool rtl8192_phy_checkBBAndRF(struct net_device* dev, enum hw90_block CheckBlock, RF90_RADIO_PATH_E eRFPath); extern bool rtl8192_BBConfig(struct net_device* dev); extern void rtl8192_phy_getTxPower(struct net_device* dev); extern void rtl8192_phy_setTxPower(struct net_device* dev, u8 channel); |