| Message ID | 20231013124534.19714-1-dmantipov@yandex.ru (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9a66e73094add3d5f330db83982aa20591189fcc |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | [v2] wifi: rtlwifi: cleanup struct rtl_ps_ctl | expand |
> -----Original Message----- > From: Dmitry Antipov <dmantipov@yandex.ru> > Sent: Friday, October 13, 2023 8:46 PM > To: Ping-Ke Shih <pkshih@realtek.com> > Cc: Kalle Valo <kvalo@kernel.org>; linux-wireless@vger.kernel.org; Dmitry Antipov <dmantipov@yandex.ru> > Subject: [PATCH] [v2] wifi: rtlwifi: cleanup struct rtl_ps_ctl > > Remove set but otherwise unused 'sleep_ms', 'last_action', 'state' > and 'last_slept' members of 'struct rtl_ps_ctl' (these seems to be > a leftovers from some older code) and adjust 'rtl_swlps_wq_callback()' > accordingly. Compile tested only. > > Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru> Acked-by: Ping-Ke Shih <pkshih@realtek.com> Thanks.
Dmitry Antipov <dmantipov@yandex.ru> wrote: > Remove set but otherwise unused 'sleep_ms', 'last_action', 'state' > and 'last_slept' members of 'struct rtl_ps_ctl' (these seems to be > a leftovers from some older code) and adjust 'rtl_swlps_wq_callback()' > accordingly. Compile tested only. > > Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru> > Acked-by: Ping-Ke Shih <pkshih@realtek.com> Patch applied to wireless-next.git, thanks. 9a66e73094ad wifi: rtlwifi: cleanup struct rtl_ps_ctl
diff --git a/drivers/net/wireless/realtek/rtlwifi/ps.c b/drivers/net/wireless/realtek/rtlwifi/ps.c index 629c03271bde..6241e4fed4f6 100644 --- a/drivers/net/wireless/realtek/rtlwifi/ps.c +++ b/drivers/net/wireless/realtek/rtlwifi/ps.c @@ -681,25 +681,10 @@ void rtl_swlps_wq_callback(struct work_struct *work) ps_work.work); struct ieee80211_hw *hw = rtlworks->hw; struct rtl_priv *rtlpriv = rtl_priv(hw); - bool ps = false; - - ps = (hw->conf.flags & IEEE80211_CONF_PS); /* we can sleep after ps null send ok */ - if (rtlpriv->psc.state_inap) { + if (rtlpriv->psc.state_inap) rtl_swlps_rf_sleep(hw); - - if (rtlpriv->psc.state && !ps) { - rtlpriv->psc.sleep_ms = jiffies_to_msecs(jiffies - - rtlpriv->psc.last_action); - } - - if (ps) - rtlpriv->psc.last_slept = jiffies; - - rtlpriv->psc.last_action = jiffies; - rtlpriv->psc.state = ps; - } } static void rtl_p2p_noa_ie(struct ieee80211_hw *hw, void *data, diff --git a/drivers/net/wireless/realtek/rtlwifi/wifi.h b/drivers/net/wireless/realtek/rtlwifi/wifi.h index 47b4685b6d24..e1004c4c928e 100644 --- a/drivers/net/wireless/realtek/rtlwifi/wifi.h +++ b/drivers/net/wireless/realtek/rtlwifi/wifi.h @@ -2032,19 +2032,15 @@ struct rtl_ps_ctl { /* for SW LPS*/ bool sw_ps_enabled; - bool state; bool state_inap; bool multi_buffered; u16 nullfunc_seq; unsigned int dtim_counter; - unsigned int sleep_ms; unsigned long last_sleep_jiffies; unsigned long last_awake_jiffies; unsigned long last_delaylps_stamp_jiffies; unsigned long last_dtim; unsigned long last_beacon; - unsigned long last_action; - unsigned long last_slept; /*For P2P PS */ struct rtl_p2p_ps_info p2p_ps_info;
Remove set but otherwise unused 'sleep_ms', 'last_action', 'state' and 'last_slept' members of 'struct rtl_ps_ctl' (these seems to be a leftovers from some older code) and adjust 'rtl_swlps_wq_callback()' accordingly. Compile tested only. Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru> --- v2: drop 'state' member and related code as well (Ping-Ke Shih) --- drivers/net/wireless/realtek/rtlwifi/ps.c | 17 +---------------- drivers/net/wireless/realtek/rtlwifi/wifi.h | 4 ---- 2 files changed, 1 insertion(+), 20 deletions(-)