UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: rtl8723au: Fold _ps_open_RF23a() into rtl8723au_hal_init() 

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jes Sorensen 2014-11-30 16:05:05 -05:00 committed by Greg Kroah-Hartman
parent 6e1c29fd9e
commit 0e316c2251
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/staging/rtl8723au/hal/usb_halinit.c
View File

@ -25,6 +25,10 @@
#include <usb_ops.h> #include <usb_ops.h>
static void phy_SsPwrSwitch92CU(struct rtw_adapter *Adapter,
enum rt_rf_power_state eRFPowerState,
int bRegSSPwrLvl);
static void static void
_ConfigChipOutEP(struct rtw_adapter *pAdapter, u8 NumOutPipe) _ConfigChipOutEP(struct rtw_adapter *pAdapter, u8 NumOutPipe)
{ {
@ -495,8 +499,6 @@ enum rt_rf_power_state RfOnOffDetect23a(struct rtw_adapter *pAdapter)
return rfpowerstate; return rfpowerstate;
} }
void _ps_open_RF23a(struct rtw_adapter *padapter);
int rtl8723au_hal_init(struct rtw_adapter *Adapter) int rtl8723au_hal_init(struct rtw_adapter *Adapter)
{ {
u8 val8 = 0; u8 val8 = 0;
@ -511,7 +513,9 @@ int rtl8723au_hal_init(struct rtw_adapter *Adapter)
Adapter->hw_init_completed = false; Adapter->hw_init_completed = false;
if (Adapter->pwrctrlpriv.bkeepfwalive) { if (Adapter->pwrctrlpriv.bkeepfwalive) {
_ps_open_RF23a(Adapter); /* here call with bRegSSPwrLvl 1, bRegSSPwrLvl 2
needs to be verified */
phy_SsPwrSwitch92CU(Adapter, rf_on, 1);
if (pHalData->bIQKInitialized) { if (pHalData->bIQKInitialized) {
rtl8723a_phy_iq_calibrate(Adapter, true); rtl8723a_phy_iq_calibrate(Adapter, true);
@ -1027,12 +1031,6 @@ static void phy_SsPwrSwitch92CU(struct rtw_adapter *Adapter,
} /* phy_PowerSwitch92CU */ } /* phy_PowerSwitch92CU */
void _ps_open_RF23a(struct rtw_adapter *padapter)
{
/* here call with bRegSSPwrLvl 1, bRegSSPwrLvl 2 needs to be verified */
phy_SsPwrSwitch92CU(padapter, rf_on, 1);
}
static void CardDisableRTL8723U(struct rtw_adapter *Adapter) static void CardDisableRTL8723U(struct rtw_adapter *Adapter)
{ {
u8 u1bTmp; u8 u1bTmp;