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

staging: rtl8192e: Rename rtl8192_phy_CheckIsLegalRFPath

Use naming schema found in other rtlwifi devices.
Rename rtl8192_phy_CheckIsLegalRFPath to rtl92e_is_legal_rf_path.
Signed-off-by: default avatarMateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e21d14d8
...@@ -29,7 +29,7 @@ void rtl92e_set_bandwidth(struct net_device *dev, ...@@ -29,7 +29,7 @@ void rtl92e_set_bandwidth(struct net_device *dev,
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
for (eRFPath = 0; eRFPath < priv->NumTotalRFPath; eRFPath++) { for (eRFPath = 0; eRFPath < priv->NumTotalRFPath; eRFPath++) {
if (!rtl8192_phy_CheckIsLegalRFPath(dev, eRFPath)) if (!rtl92e_is_legal_rf_path(dev, eRFPath))
continue; continue;
switch (Bandwidth) { switch (Bandwidth) {
...@@ -96,7 +96,7 @@ static bool phy_RF8256_Config_ParaFile(struct net_device *dev) ...@@ -96,7 +96,7 @@ static bool phy_RF8256_Config_ParaFile(struct net_device *dev)
for (eRFPath = (enum rf90_radio_path)RF90_PATH_A; for (eRFPath = (enum rf90_radio_path)RF90_PATH_A;
eRFPath < priv->NumTotalRFPath; eRFPath++) { eRFPath < priv->NumTotalRFPath; eRFPath++) {
if (!rtl8192_phy_CheckIsLegalRFPath(dev, eRFPath)) if (!rtl92e_is_legal_rf_path(dev, eRFPath))
continue; continue;
pPhyReg = &priv->PHYRegDef[eRFPath]; pPhyReg = &priv->PHYRegDef[eRFPath];
......
...@@ -1745,8 +1745,7 @@ static void rtl8192_process_phyinfo(struct r8192_priv *priv, u8 *buffer, ...@@ -1745,8 +1745,7 @@ static void rtl8192_process_phyinfo(struct r8192_priv *priv, u8 *buffer,
priv->stats.num_process_phyinfo++; priv->stats.num_process_phyinfo++;
if (!prev_st->bIsCCK && prev_st->bPacketToSelf) { if (!prev_st->bIsCCK && prev_st->bPacketToSelf) {
for (rfpath = RF90_PATH_A; rfpath < RF90_PATH_C; rfpath++) { for (rfpath = RF90_PATH_A; rfpath < RF90_PATH_C; rfpath++) {
if (!rtl8192_phy_CheckIsLegalRFPath(priv->rtllib->dev, if (!rtl92e_is_legal_rf_path(priv->rtllib->dev, rfpath))
rfpath))
continue; continue;
RT_TRACE(COMP_DBG, RT_TRACE(COMP_DBG,
"Jacken -> pPreviousstats->RxMIMOSignalStrength[rfpath] = %d\n", "Jacken -> pPreviousstats->RxMIMOSignalStrength[rfpath] = %d\n",
......
...@@ -64,7 +64,7 @@ static u32 rtl8192_CalculateBitShift(u32 dwBitMask) ...@@ -64,7 +64,7 @@ static u32 rtl8192_CalculateBitShift(u32 dwBitMask)
return i; return i;
} }
u8 rtl8192_phy_CheckIsLegalRFPath(struct net_device *dev, u32 eRFPath) u8 rtl92e_is_legal_rf_path(struct net_device *dev, u32 eRFPath)
{ {
u8 ret = 1; u8 ret = 1;
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
...@@ -222,7 +222,7 @@ void rtl8192_phy_SetRFReg(struct net_device *dev, enum rf90_radio_path eRFPath, ...@@ -222,7 +222,7 @@ void rtl8192_phy_SetRFReg(struct net_device *dev, enum rf90_radio_path eRFPath,
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
u32 Original_Value, BitShift, New_Value; u32 Original_Value, BitShift, New_Value;
if (!rtl8192_phy_CheckIsLegalRFPath(dev, eRFPath)) if (!rtl92e_is_legal_rf_path(dev, eRFPath))
return; return;
if (priv->rtllib->eRFPowerState != eRfOn && !priv->being_init_adapter) if (priv->rtllib->eRFPowerState != eRfOn && !priv->being_init_adapter)
return; return;
...@@ -262,7 +262,7 @@ u32 rtl8192_phy_QueryRFReg(struct net_device *dev, enum rf90_radio_path eRFPath, ...@@ -262,7 +262,7 @@ u32 rtl8192_phy_QueryRFReg(struct net_device *dev, enum rf90_radio_path eRFPath,
u32 Original_Value, Readback_Value, BitShift; u32 Original_Value, Readback_Value, BitShift;
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
if (!rtl8192_phy_CheckIsLegalRFPath(dev, eRFPath)) if (!rtl92e_is_legal_rf_path(dev, eRFPath))
return 0; return 0;
if (priv->rtllib->eRFPowerState != eRfOn && !priv->being_init_adapter) if (priv->rtllib->eRFPowerState != eRfOn && !priv->being_init_adapter)
return 0; return 0;
......
...@@ -67,8 +67,7 @@ enum rf90_radio_path { ...@@ -67,8 +67,7 @@ enum rf90_radio_path {
#define bMaskLWord 0x0000ffff #define bMaskLWord 0x0000ffff
#define bMaskDWord 0xffffffff #define bMaskDWord 0xffffffff
extern u8 rtl8192_phy_CheckIsLegalRFPath(struct net_device *dev, extern u8 rtl92e_is_legal_rf_path(struct net_device *dev, u32 eRFPath);
u32 eRFPath);
extern void rtl8192_setBBreg(struct net_device *dev, u32 dwRegAddr, extern void rtl8192_setBBreg(struct net_device *dev, u32 dwRegAddr,
u32 dwBitMask, u32 dwData); u32 dwBitMask, u32 dwData);
extern u32 rtl8192_QueryBBReg(struct net_device *dev, u32 dwRegAddr, extern u32 rtl8192_QueryBBReg(struct net_device *dev, u32 dwRegAddr,
......
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