diff --git a/core/rtw_pwrctrl.c b/core/rtw_pwrctrl.c
index db518f0..ea7fd85 100644
--- a/core/rtw_pwrctrl.c
+++ b/core/rtw_pwrctrl.c
@@ -356,20 +356,11 @@ _func_enter_;
 			pslv = PS_STATE_S3;
 	}
 
-#ifdef CONFIG_LPS_RPWM_TIMER
-	if (pwrpriv->brpwmtimeout == true)
-	{
-		DBG_88E("%s: RPWM timeout, force to set RPWM(0x%02X) again!\n", __func__, pslv);
-	}
-	else
-#endif /*  CONFIG_LPS_RPWM_TIMER */
-	{
 	if ( (pwrpriv->rpwm == pslv)) {
 		RT_TRACE(_module_rtl871x_pwrctrl_c_,_drv_err_,
 			("%s: Already set rpwm[0x%02X], new=0x%02X!\n", __func__, pwrpriv->rpwm, pslv));
 		return;
 	}
-	}
 
 	if ((padapter->bSurpriseRemoved == true) ||
 		(padapter->hw_init_completed == false))
@@ -401,10 +392,6 @@ _func_enter_;
 
 	pwrpriv->rpwm = pslv;
 
-#ifdef CONFIG_LPS_RPWM_TIMER
-	if (rpwm & PS_ACK)
-		_set_timer(&pwrpriv->pwr_rpwm_timer, LPS_RPWM_WAIT_MS);
-#endif /*  CONFIG_LPS_RPWM_TIMER */
 	rtw_hal_set_hwreg(padapter, HW_VAR_SET_RPWM, (u8 *)(&rpwm));
 
 	pwrpriv->tog += 0x80;
diff --git a/include/rtw_pwrctrl.h b/include/rtw_pwrctrl.h
index 233e9b5..776ba73 100644
--- a/include/rtw_pwrctrl.h
+++ b/include/rtw_pwrctrl.h
@@ -191,11 +191,6 @@ struct pwrctrl_priv
 
 	u32	alives;
 	_workitem cpwm_event;
-#ifdef CONFIG_LPS_RPWM_TIMER
-	u8 brpwmtimeout;
-	_workitem rpwmtimeoutwi;
-	_timer pwr_rpwm_timer;
-#endif // CONFIG_LPS_RPWM_TIMER
 	u8	bpower_saving;
 
 	u8	b_hw_radio_off;