aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJes Sorensen <Jes.Sorensen@redhat.com>2014-07-31 04:36:43 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-08-01 17:43:37 -0400
commit06736c291492f90f779fe6127431036b73b0a7b4 (patch)
treea9f986746b51cddb085355fbfa2cea11b14b4fa2
parenta48dd468efbb75a47447f82c849b1d43255a6792 (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>
-rw-r--r--drivers/staging/rtl8723au/hal/usb_halinit.c21
-rw-r--r--drivers/staging/rtl8723au/include/rtw_pwrctrl.h1
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 681810ea657b..b49bf33184de 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)
517 u8 val8; 517 u8 val8;
518 enum rt_rf_power_state rfpowerstate = rf_off; 518 enum rt_rf_power_state rfpowerstate = rf_off;
519 519
520 if (pAdapter->pwrctrlpriv.bHWPowerdown) { 520 rtl8723au_write8(pAdapter, REG_MAC_PINMUX_CFG,
521 val8 = rtl8723au_read8(pAdapter, REG_HSISR); 521 rtl8723au_read8(pAdapter,
522 DBG_8723A("pwrdown, 0x5c(BIT7) =%02x\n", val8); 522 REG_MAC_PINMUX_CFG) & ~BIT(3));
523 rfpowerstate = (val8 & BIT(7)) ? rf_off : rf_on; 523 val8 = rtl8723au_read8(pAdapter, REG_GPIO_IO_SEL);
524 } else { /* rf on/off */ 524 DBG_8723A("GPIO_IN =%02x\n", val8);
525 rtl8723au_write8(pAdapter, REG_MAC_PINMUX_CFG, 525 rfpowerstate = (val8 & BIT(3)) ? rf_on : rf_off;
526 rtl8723au_read8(pAdapter, REG_MAC_PINMUX_CFG) & 526
527 ~BIT(3));
528 val8 = rtl8723au_read8(pAdapter, REG_GPIO_IO_SEL);
529 DBG_8723A("GPIO_IN =%02x\n", val8);
530 rfpowerstate = (val8 & BIT(3)) ? rf_on : rf_off;
531 }
532 return rfpowerstate; 527 return rfpowerstate;
533} /* HalDetectPwrDownMode */ 528}
534 529
535void _ps_open_RF23a(struct rtw_adapter *padapter); 530void _ps_open_RF23a(struct rtw_adapter *padapter);
536 531
diff --git a/drivers/staging/rtl8723au/include/rtw_pwrctrl.h b/drivers/staging/rtl8723au/include/rtw_pwrctrl.h
index be465c2cf2fe..599fed9b365d 100644
--- a/drivers/staging/rtl8723au/include/rtw_pwrctrl.h
+++ b/drivers/staging/rtl8723au/include/rtw_pwrctrl.h
@@ -198,7 +198,6 @@ struct pwrctrl_priv {
198 enum rt_rf_power_state rf_pwrstate;/* cur power state */ 198 enum rt_rf_power_state rf_pwrstate;/* cur power state */
199 enum rt_rf_power_state change_rfpwrstate; 199 enum rt_rf_power_state change_rfpwrstate;
200 200
201 u8 bHWPowerdown;/* if support hw power down */
202 u8 bkeepfwalive; 201 u8 bkeepfwalive;
203 unsigned long PS_BBRegBackup[PSBBREG_TOTALCNT]; 202 unsigned long PS_BBRegBackup[PSBBREG_TOTALCNT];
204}; 203};