public inbox for linux-staging@lists.linux.dev
 help / color / mirror / Atom feed
From: "Jose A. Perez de Azpillaga" <azpijr@gmail.com>
To: linux-staging@lists.linux.dev
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	linux-kernel@vger.kernel.org
Subject: [PATCH 3/4] staging: rtl8723bs: fix CamelCase in power management logic
Date: Sun,  8 Mar 2026 20:27:18 +0100	[thread overview]
Message-ID: <20260308192734.186757-4-azpijr@gmail.com> (raw)
In-Reply-To: <20260308192734.186757-1-azpijr@gmail.com>

Clean up CamelCase variables and functions specifically related to
LPS and general power management.

Signed-off-by: Jose A. Perez de Azpillaga <azpijr@gmail.com>
---
 drivers/staging/rtl8723bs/core/rtw_cmd.c       |  4 ++--
 drivers/staging/rtl8723bs/core/rtw_pwrctrl.c   | 18 +++++++++---------
 .../staging/rtl8723bs/include/rtw_pwrctrl.h    |  8 ++++----
 .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c  |  4 ++--
 drivers/staging/rtl8723bs/os_dep/os_intfs.c    |  6 +++---
 drivers/staging/rtl8723bs/os_dep/sdio_intf.c   |  2 +-
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c
index 2a6479ef4499..7b9baa9cab6c 100644
--- a/drivers/staging/rtl8723bs/core/rtw_cmd.c
+++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c
@@ -1288,7 +1288,7 @@ void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type)
 	case LPS_CTRL_CONNECT:
 		mstatus = 1;/* connect */
 		/*  Reset LPS Setting */
-		pwrpriv->LpsIdleCount = 0;
+		pwrpriv->lps_idle_count = 0;
 		rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_JOINBSSRPT, (u8 *)(&mstatus));
 		rtw_btcoex_MediaStatusNotify(padapter, mstatus);
 		break;
@@ -1299,7 +1299,7 @@ void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type)
 		rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_JOINBSSRPT, (u8 *)(&mstatus));
 		break;
 	case LPS_CTRL_SPECIAL_PACKET:
-		pwrpriv->DelayLPSLastTimeStamp = jiffies;
+		pwrpriv->delay_lps_last_timestamp = jiffies;
 		hal_btcoex_SpecialPacketNotify(padapter, PACKET_DHCP);
 		LPS_Leave(padapter, "LPS_CTRL_SPECIAL_PACKET");
 		break;
diff --git a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
index 88888de9e903..e998f695cc52 100644
--- a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
+++ b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
@@ -308,7 +308,7 @@ static u8 PS_RDY_CHECK(struct adapter *padapter)

 	curr_time = jiffies;

-	delta_time = curr_time - pwrpriv->DelayLPSLastTimeStamp;
+	delta_time = curr_time - pwrpriv->delay_lps_last_timestamp;

 	if (delta_time < LPS_DELAY_TIME)
 		return false;
@@ -448,14 +448,14 @@ void LPS_Enter(struct adapter *padapter, const char *msg)

 	if (pwrpriv->leisure_ps) {
 		/*  Idle for a while if we connect to AP a while ago. */
-		if (pwrpriv->LpsIdleCount >= 2) { /*   4 Sec */
+		if (pwrpriv->lps_idle_count >= 2) { /*   4 Sec */
 			if (pwrpriv->pwr_mode == PS_MODE_ACTIVE) {
 				scnprintf(buf, sizeof(buf), "WIFI-%s", msg);
 				pwrpriv->bpower_saving = true;
 				rtw_set_ps_mode(padapter, pwrpriv->power_mgnt, padapter->registrypriv.smart_ps, 0, buf);
 			}
 		} else
-			pwrpriv->LpsIdleCount++;
+			pwrpriv->lps_idle_count++;
 	}
 }

@@ -484,7 +484,7 @@ void LPS_Leave(struct adapter *padapter, const char *msg)
 	pwrpriv->bpower_saving = false;
 }

-void LeaveAllPowerSaveModeDirect(struct adapter *Adapter)
+void leave_all_power_save_mode_direct(struct adapter *Adapter)
 {
 	struct adapter *pri_padapter = GET_PRIMARY_ADAPTER(Adapter);
 	struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv);
@@ -515,7 +515,7 @@ void LeaveAllPowerSaveModeDirect(struct adapter *Adapter)
 /*  Description: Leave all power save mode: LPS, FwLPS, IPS if needed. */
 /*  Move code to function by tynli. 2010.03.26. */
 /*  */
-void LeaveAllPowerSaveMode(struct adapter *Adapter)
+void leave_all_power_save_mode(struct adapter *Adapter)
 {
 	struct dvobj_priv *dvobj = adapter_to_dvobj(Adapter);
 	u8 enqueue = 0;
@@ -953,7 +953,7 @@ void rtw_init_pwrctrl_priv(struct adapter *padapter)
 	pwrctrlpriv->in_suspend = false;
 	pwrctrlpriv->bkeepfwalive = false;

-	pwrctrlpriv->LpsIdleCount = 0;
+	pwrctrlpriv->lps_idle_count = 0;
 	pwrctrlpriv->power_mgnt = padapter->registrypriv.power_mgnt;/*  PS_MODE_MIN; */
 	pwrctrlpriv->leisure_ps = pwrctrlpriv->power_mgnt != PS_MODE_ACTIVE;

@@ -1011,7 +1011,7 @@ int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *cal
 	unsigned long deny_time = jiffies + msecs_to_jiffies(ips_deffer_ms);

 	/* for LPS */
-	LeaveAllPowerSaveMode(padapter);
+	leave_all_power_save_mode(padapter);

 	/* IPS still bound with primary adapter */
 	padapter = GET_PRIMARY_ADAPTER(padapter);
@@ -1079,9 +1079,9 @@ int rtw_pm_set_lps(struct adapter *padapter, u8 mode)
 	if (mode < PS_MODE_NUM) {
 		if (pwrctrlpriv->power_mgnt != mode) {
 			if (mode == PS_MODE_ACTIVE)
-				LeaveAllPowerSaveMode(padapter);
+				leave_all_power_save_mode(padapter);
 			else
-				pwrctrlpriv->LpsIdleCount = 2;
+				pwrctrlpriv->lps_idle_count = 2;

 			pwrctrlpriv->power_mgnt = mode;
 			pwrctrlpriv->leisure_ps =
diff --git a/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h b/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h
index 2872501ac85f..6c0b007408c2 100644
--- a/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h
+++ b/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h
@@ -165,11 +165,11 @@ struct pwrctrl_priv {

 	u8 fw_psmode_iface_id;
 	u8 leisure_ps;
-	u8 LpsIdleCount;
+	u8 lps_idle_count;
 	u8 power_mgnt;
 	u8 org_power_mgnt;
 	bool fw_current_in_ps_mode;
-	unsigned long	DelayLPSLastTimeStamp;
+	unsigned long	delay_lps_last_timestamp;
 	s32		pnp_current_pwr_state;
 	u8 pnp_bstop_trx;

@@ -224,8 +224,8 @@ extern void rtw_unregister_cmd_alive(struct adapter *padapter);
 extern void cpwm_int_hdl(struct adapter *padapter, struct reportpwrstate_parm *preportpwrstate);
 extern void LPS_Leave_check(struct adapter *padapter);

-extern void LeaveAllPowerSaveMode(struct adapter *Adapter);
-extern void LeaveAllPowerSaveModeDirect(struct adapter *Adapter);
+extern void leave_all_power_save_mode(struct adapter *Adapter);
+extern void leave_all_power_save_mode_direct(struct adapter *Adapter);
 void _ips_enter(struct adapter *padapter);
 void ips_enter(struct adapter *padapter);
 int _ips_leave(struct adapter *padapter);
diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index a558592068e0..2d60dc669bd3 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@ -1606,7 +1606,7 @@ static int cfg80211_rtw_leave_ibss(struct wiphy *wiphy, struct net_device *ndev)

 	if (check_fwstate(&padapter->mlmepriv, _FW_LINKED)) {
 		rtw_scan_abort(padapter);
-		LeaveAllPowerSaveMode(padapter);
+		leave_all_power_save_mode(padapter);

 		rtw_wdev->iftype = NL80211_IFTYPE_STATION;

@@ -1783,7 +1783,7 @@ static int cfg80211_rtw_disconnect(struct wiphy *wiphy, struct net_device *ndev,
 	rtw_set_to_roam(padapter, 0);

 	rtw_scan_abort(padapter);
-	LeaveAllPowerSaveMode(padapter);
+	leave_all_power_save_mode(padapter);
 	rtw_disassoc_cmd(padapter, 500, false);

 	rtw_indicate_disconnect(padapter);
diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index 3b5ef0c7a403..07a94828a75a 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -948,7 +948,7 @@ static int netdev_close(struct net_device *pnetdev)
 		}

 		/* s2. */
-		LeaveAllPowerSaveMode(padapter);
+		leave_all_power_save_mode(padapter);
 		rtw_disassoc_cmd(padapter, 500, false);
 		/* s2-2.  indicate disconnect to os */
 		rtw_indicate_disconnect(padapter);
@@ -999,7 +999,7 @@ void rtw_dev_unload(struct adapter *padapter)
 			/* check HW status and SW state */
 			netdev_dbg(padapter->pnetdev,
 				   "%s: driver in IPS-FWLPS\n", __func__);
-			LeaveAllPowerSaveMode(padapter);
+			leave_all_power_save_mode(padapter);
 		} else {
 			netdev_dbg(padapter->pnetdev,
 				   "%s: driver not in IPS\n", __func__);
@@ -1100,7 +1100,7 @@ void rtw_suspend_common(struct adapter *padapter)

 	rtw_cancel_all_timer(padapter);

-	LeaveAllPowerSaveModeDirect(padapter);
+	leave_all_power_save_mode_direct(padapter);

 	rtw_stop_cmd_thread(padapter);

diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
index 126107d69a74..27977c8be620 100644
--- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
+++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
@@ -404,7 +404,7 @@ static void rtw_dev_remove(struct sdio_func *func)
 	rtw_pm_set_ips(padapter, IPS_NONE);
 	rtw_pm_set_lps(padapter, PS_MODE_ACTIVE);

-	LeaveAllPowerSaveMode(padapter);
+	leave_all_power_save_mode(padapter);

 	rtw_btcoex_HaltNotify(padapter);

--
2.53.0


  parent reply	other threads:[~2026-03-08 19:28 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-03-08 19:27 [PATCH 0/4] staging: rtl8723bs: CamelCase cleanup series Jose A. Perez de Azpillaga
2026-03-08 19:27 ` [PATCH 1/4] staging: rtl8723bs: remove Hungarian notation from booleans Jose A. Perez de Azpillaga
2026-03-09 16:54   ` Greg Kroah-Hartman
2026-03-08 19:27 ` [PATCH 2/4] staging: rtl8723bs: rename hal_btcoex functions to snake_case Jose A. Perez de Azpillaga
2026-03-09 16:54   ` Greg Kroah-Hartman
2026-03-08 19:27 ` Jose A. Perez de Azpillaga [this message]
2026-03-08 19:27 ` [PATCH 4/4] staging: rtl8723bs: fix CamelCase in security identifiers Jose A. Perez de Azpillaga

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260308192734.186757-4-azpijr@gmail.com \
    --to=azpijr@gmail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-staging@lists.linux.dev \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox