Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 20:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: rtl8192e: Remove phy_RF8256_Config_ParaFile

Browse Source 
Merge function into rtl92e_config_rf as having them
separated gives no benefit.

Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mateusz Kulikowski 2015-07-28 23:31:44 +02:00 committed by Greg Kroah-Hartman
parent 72f1f75257
commit 90959c3dfc
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c
View File

@ -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;
u8 eRFPath;
@ -77,6 +77,8 @@ static bool phy_RF8256_Config_ParaFile(struct net_device *dev)
u8 ConstRetryTimes = 5, RetryTimes = 5;
u8 ret = 0;
priv->NumTotalRFPath = RTL819X_TOTAL_RF_PATH;
for (eRFPath = (enum rf90_radio_path)RF90_PATH_A;
eRFPath < priv->NumTotalRFPath; eRFPath++) {
if (!rtl92e_is_legal_rf_path(dev, eRFPath))
@ -115,7 +117,7 @@ static bool phy_RF8256_Config_ParaFile(struct net_device *dev)
if (!rtStatus) {
netdev_err(dev, "%s(): Failed to check RF Path %d.\n",
__func__, eRFPath);
goto phy_RF8256_Config_ParaFile_Fail;
goto fail;
}
RetryTimes = ConstRetryTimes;
@ -203,7 +205,7 @@ static bool phy_RF8256_Config_ParaFile(struct net_device *dev)
netdev_err(dev,
"%s(): Failed to initialize RF Path %d.\n",
__func__, eRFPath);
goto phy_RF8256_Config_ParaFile_Fail;
goto fail;
}
}
@ -211,18 +213,10 @@ static bool phy_RF8256_Config_ParaFile(struct net_device *dev)
RT_TRACE(COMP_PHY, "PHY Initialization Success\n");
return true;
phy_RF8256_Config_ParaFile_Fail:
fail:
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)
{
u32 TxAGC = 0;