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

staging: rtl8192e: Remove phy_RF8256_Config_ParaFile

Merge function into rtl92e_config_rf as having them
separated gives no benefit.
Signed-off-by: default avatarMateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 72f1f752
...@@ -64,7 +64,7 @@ void rtl92e_set_bandwidth(struct net_device *dev, ...@@ -64,7 +64,7 @@ void rtl92e_set_bandwidth(struct net_device *dev,
} }
} }
static bool phy_RF8256_Config_ParaFile(struct net_device *dev) bool rtl92e_config_rf(struct net_device *dev)
{ {
u32 u4RegValue = 0; u32 u4RegValue = 0;
u8 eRFPath; u8 eRFPath;
...@@ -77,6 +77,8 @@ static bool phy_RF8256_Config_ParaFile(struct net_device *dev) ...@@ -77,6 +77,8 @@ static bool phy_RF8256_Config_ParaFile(struct net_device *dev)
u8 ConstRetryTimes = 5, RetryTimes = 5; u8 ConstRetryTimes = 5, RetryTimes = 5;
u8 ret = 0; u8 ret = 0;
priv->NumTotalRFPath = RTL819X_TOTAL_RF_PATH;
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 (!rtl92e_is_legal_rf_path(dev, eRFPath)) if (!rtl92e_is_legal_rf_path(dev, eRFPath))
...@@ -115,7 +117,7 @@ static bool phy_RF8256_Config_ParaFile(struct net_device *dev) ...@@ -115,7 +117,7 @@ static bool phy_RF8256_Config_ParaFile(struct net_device *dev)
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);
goto phy_RF8256_Config_ParaFile_Fail; goto fail;
} }
RetryTimes = ConstRetryTimes; RetryTimes = ConstRetryTimes;
...@@ -203,7 +205,7 @@ static bool phy_RF8256_Config_ParaFile(struct net_device *dev) ...@@ -203,7 +205,7 @@ static bool phy_RF8256_Config_ParaFile(struct net_device *dev)
netdev_err(dev, netdev_err(dev,
"%s(): Failed to initialize RF Path %d.\n", "%s(): Failed to initialize RF Path %d.\n",
__func__, eRFPath); __func__, eRFPath);
goto phy_RF8256_Config_ParaFile_Fail; goto fail;
} }
} }
...@@ -211,18 +213,10 @@ static bool phy_RF8256_Config_ParaFile(struct net_device *dev) ...@@ -211,18 +213,10 @@ static bool phy_RF8256_Config_ParaFile(struct net_device *dev)
RT_TRACE(COMP_PHY, "PHY Initialization Success\n"); RT_TRACE(COMP_PHY, "PHY Initialization Success\n");
return true; return true;
phy_RF8256_Config_ParaFile_Fail: fail:
return false; return false;
} }
bool rtl92e_config_rf(struct net_device *dev)
{
struct r8192_priv *priv = rtllib_priv(dev);
priv->NumTotalRFPath = RTL819X_TOTAL_RF_PATH;
return phy_RF8256_Config_ParaFile(dev);
}
void rtl92e_set_cck_tx_power(struct net_device *dev, u8 powerlevel) void rtl92e_set_cck_tx_power(struct net_device *dev, u8 powerlevel)
{ {
u32 TxAGC = 0; u32 TxAGC = 0;
......
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