diff options
| author | Jes Sorensen <Jes.Sorensen@redhat.com> | 2014-07-31 10:36:43 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-08-01 14:43:37 -0700 |
| commit | 06736c291492f90f779fe6127431036b73b0a7b4 (patch) | |
| tree | a9f986746b51cddb085355fbfa2cea11b14b4fa2 /drivers | |
| parent | a48dd468efbb75a47447f82c849b1d43255a6792 (diff) | |
staging: rtl8723au: Remove never set struct pwrctrl_priv.bHWPowerdown
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/rtl8723au/hal/usb_halinit.c | 21 | ||||
| -rw-r--r-- | drivers/staging/rtl8723au/include/rtw_pwrctrl.h | 1 |
2 files changed, 8 insertions, 14 deletions
diff --git a/drivers/staging/rtl8723au/hal/usb_halinit.c b/drivers/staging/rtl8723au/hal/usb_halinit.c index 681810ea657..b49bf33184d 100644 --- a/drivers/staging/rtl8723au/hal/usb_halinit.c +++ b/drivers/staging/rtl8723au/hal/usb_halinit.c @@ -517,20 +517,15 @@ enum rt_rf_power_state RfOnOffDetect23a(struct rtw_adapter *pAdapter) u8 val8; enum rt_rf_power_state rfpowerstate = rf_off; - if (pAdapter->pwrctrlpriv.bHWPowerdown) { - val8 = rtl8723au_read8(pAdapter, REG_HSISR); - DBG_8723A("pwrdown, 0x5c(BIT7) =%02x\n", val8); - rfpowerstate = (val8 & BIT(7)) ? rf_off : rf_on; - } else { /* rf on/off */ - rtl8723au_write8(pAdapter, REG_MAC_PINMUX_CFG, - rtl8723au_read8(pAdapter, REG_MAC_PINMUX_CFG) & - ~BIT(3)); - val8 = rtl8723au_read8(pAdapter, REG_GPIO_IO_SEL); - DBG_8723A("GPIO_IN =%02x\n", val8); - rfpowerstate = (val8 & BIT(3)) ? rf_on : rf_off; - } + rtl8723au_write8(pAdapter, REG_MAC_PINMUX_CFG, + rtl8723au_read8(pAdapter, + REG_MAC_PINMUX_CFG) & ~BIT(3)); + val8 = rtl8723au_read8(pAdapter, REG_GPIO_IO_SEL); + DBG_8723A("GPIO_IN =%02x\n", val8); + rfpowerstate = (val8 & BIT(3)) ? rf_on : rf_off; + return rfpowerstate; -} /* HalDetectPwrDownMode */ +} void _ps_open_RF23a(struct rtw_adapter *padapter); diff --git a/drivers/staging/rtl8723au/include/rtw_pwrctrl.h b/drivers/staging/rtl8723au/include/rtw_pwrctrl.h index be465c2cf2f..599fed9b365 100644 --- a/drivers/staging/rtl8723au/include/rtw_pwrctrl.h +++ b/drivers/staging/rtl8723au/include/rtw_pwrctrl.h @@ -198,7 +198,6 @@ struct pwrctrl_priv { enum rt_rf_power_state rf_pwrstate;/* cur power state */ enum rt_rf_power_state change_rfpwrstate; - u8 bHWPowerdown;/* if support hw power down */ u8 bkeepfwalive; unsigned long PS_BBRegBackup[PSBBREG_TOTALCNT]; }; |