aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/rtl8723au/hal/usb_halinit.c
diff options
context:
space:
mode:
authorJes Sorensen <Jes.Sorensen@redhat.com>2014-11-30 16:05:05 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-12-02 16:40:00 -0800
commit0e316c225100e68e082f57bf1959382f2e345648 (patch)
treedbced07802c67243ad9ad6aeb2b50df8ef4d0a7f /drivers/staging/rtl8723au/hal/usb_halinit.c
parent6e1c29fd9e10af8aff4f9fe628e1ca9d337e90a9 (diff)
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>
Diffstat (limited to 'drivers/staging/rtl8723au/hal/usb_halinit.c')
-rw-r--r--drivers/staging/rtl8723au/hal/usb_halinit.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/staging/rtl8723au/hal/usb_halinit.c b/drivers/staging/rtl8723au/hal/usb_halinit.c
index 6c6601332035..cd3f8ba16804 100644
--- a/drivers/staging/rtl8723au/hal/usb_halinit.c
+++ b/drivers/staging/rtl8723au/hal/usb_halinit.c
@@ -25,6 +25,10 @@
#include <usb_ops.h>
+static void phy_SsPwrSwitch92CU(struct rtw_adapter *Adapter,
+ enum rt_rf_power_state eRFPowerState,
+ int bRegSSPwrLvl);
+
static void
_ConfigChipOutEP(struct rtw_adapter *pAdapter, u8 NumOutPipe)
{
@@ -495,8 +499,6 @@ enum rt_rf_power_state RfOnOffDetect23a(struct rtw_adapter *pAdapter)
return rfpowerstate;
}
-void _ps_open_RF23a(struct rtw_adapter *padapter);
-
int rtl8723au_hal_init(struct rtw_adapter *Adapter)
{
u8 val8 = 0;
@@ -511,7 +513,9 @@ int rtl8723au_hal_init(struct rtw_adapter *Adapter)
Adapter->hw_init_completed = false;
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) {
rtl8723a_phy_iq_calibrate(Adapter, true);
@@ -1027,12 +1031,6 @@ static void phy_SsPwrSwitch92CU(struct rtw_adapter *Adapter,
} /* 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)
{
u8 u1bTmp;

Privacy Policy