Commit e21d14d8 authored by Mateusz Kulikowski's avatar Mateusz Kulikowski Committed by Greg Kroah-Hartman

staging: rtl8192e: Rename rtl8192_phy_checkBBAndRF

Use naming schema found in other rtlwifi devices.
Rename rtl8192_phy_checkBBAndRF to rtl92e_check_bb_and_rf.
Signed-off-by: default avatarMateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2949353d
...@@ -127,8 +127,8 @@ static bool phy_RF8256_Config_ParaFile(struct net_device *dev) ...@@ -127,8 +127,8 @@ static bool phy_RF8256_Config_ParaFile(struct net_device *dev)
rtl8192_phy_SetRFReg(dev, (enum rf90_radio_path) eRFPath, 0x0, rtl8192_phy_SetRFReg(dev, (enum rf90_radio_path) eRFPath, 0x0,
bMask12Bits, 0xbf); bMask12Bits, 0xbf);
rtStatus = rtl8192_phy_checkBBAndRF(dev, HW90_BLOCK_RF, rtStatus = rtl92e_check_bb_and_rf(dev, HW90_BLOCK_RF,
(enum rf90_radio_path)eRFPath); (enum rf90_radio_path)eRFPath);
if (!rtStatus) { if (!rtStatus) {
netdev_err(dev, "%s(): Failed to check RF Path %d.\n", netdev_err(dev, "%s(): Failed to check RF Path %d.\n",
__func__, eRFPath); __func__, eRFPath);
......
...@@ -489,9 +489,8 @@ static void rtl8192_InitBBRFRegDef(struct net_device *dev) ...@@ -489,9 +489,8 @@ static void rtl8192_InitBBRFRegDef(struct net_device *dev)
} }
bool rtl8192_phy_checkBBAndRF(struct net_device *dev, bool rtl92e_check_bb_and_rf(struct net_device *dev, enum hw90_block CheckBlock,
enum hw90_block CheckBlock, enum rf90_radio_path eRFPath)
enum rf90_radio_path eRFPath)
{ {
bool ret = true; bool ret = true;
u32 i, CheckTimes = 4, dwRegRead = 0; u32 i, CheckTimes = 4, dwRegRead = 0;
...@@ -563,9 +562,9 @@ static bool rtl8192_BB_Config_ParaFile(struct net_device *dev) ...@@ -563,9 +562,9 @@ static bool rtl8192_BB_Config_ParaFile(struct net_device *dev)
for (eCheckItem = (enum hw90_block)HW90_BLOCK_PHY0; for (eCheckItem = (enum hw90_block)HW90_BLOCK_PHY0;
eCheckItem <= HW90_BLOCK_PHY1; eCheckItem++) { eCheckItem <= HW90_BLOCK_PHY1; eCheckItem++) {
rtStatus = rtl8192_phy_checkBBAndRF(dev, rtStatus = rtl92e_check_bb_and_rf(dev,
(enum hw90_block)eCheckItem, (enum hw90_block)eCheckItem,
(enum rf90_radio_path)0); (enum rf90_radio_path)0);
if (!rtStatus) { if (!rtStatus) {
RT_TRACE((COMP_ERR | COMP_PHY), RT_TRACE((COMP_ERR | COMP_PHY),
"rtl92e_config_rf():Check PHY%d Fail!!\n", "rtl92e_config_rf():Check PHY%d Fail!!\n",
......
...@@ -80,9 +80,9 @@ extern u32 rtl8192_phy_QueryRFReg(struct net_device *dev, ...@@ -80,9 +80,9 @@ extern u32 rtl8192_phy_QueryRFReg(struct net_device *dev,
enum rf90_radio_path eRFPath, enum rf90_radio_path eRFPath,
u32 RegAddr, u32 BitMask); u32 RegAddr, u32 BitMask);
extern void rtl8192_phy_configmac(struct net_device *dev); extern void rtl8192_phy_configmac(struct net_device *dev);
extern bool rtl8192_phy_checkBBAndRF(struct net_device *dev, extern bool rtl92e_check_bb_and_rf(struct net_device *dev,
enum hw90_block CheckBlock, enum hw90_block CheckBlock,
enum rf90_radio_path eRFPath); enum rf90_radio_path eRFPath);
extern bool rtl92e_config_bb(struct net_device *dev); extern bool rtl92e_config_bb(struct net_device *dev);
extern void rtl8192_phy_getTxPower(struct net_device *dev); extern void rtl8192_phy_getTxPower(struct net_device *dev);
extern void rtl8192_phy_setTxPower(struct net_device *dev, u8 channel); extern void rtl8192_phy_setTxPower(struct net_device *dev, u8 channel);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment