From: Michael Straube <straube.linux@gmail.com>
To: gregkh@linuxfoundation.org
Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Michael Straube <straube.linux@gmail.com>
Subject: [PATCH 2/4] staging: r8188eu: remove constant parameter from _rtw_pwr_wakeup()
Date: Sun, 3 Apr 2022 12:37:11 +0200 [thread overview]
Message-ID: <20220403103713.12883-3-straube.linux@gmail.com> (raw)
In-Reply-To: <20220403103713.12883-1-straube.linux@gmail.com>
The parameter 'ips_deffer_ms' of _rtw_pwr_wakeup() is always
RTW_PWR_STATE_CHK_INTERVAL. Make it local.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/core/rtw_pwrctrl.c | 7 +++++--
drivers/staging/r8188eu/include/rtw_pwrctrl.h | 5 ++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_pwrctrl.c b/drivers/staging/r8188eu/core/rtw_pwrctrl.c
index 08e8a5efba5e..ee324c18a1b9 100644
--- a/drivers/staging/r8188eu/core/rtw_pwrctrl.c
+++ b/drivers/staging/r8188eu/core/rtw_pwrctrl.c
@@ -349,16 +349,19 @@ void rtw_init_pwrctrl_priv(struct adapter *padapter)
/*
* rtw_pwr_wakeup - Wake the NIC up from: 1)IPS. 2)USB autosuspend
* @adapter: pointer to struct adapter structure
-* @ips_deffer_ms: the ms wiil prevent from falling into IPS after wakeup
* Return _SUCCESS or _FAIL
*/
-int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms)
+int _rtw_pwr_wakeup(struct adapter *padapter)
{
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
int ret = _SUCCESS;
u32 start = jiffies;
+ u32 ips_deffer_ms;
+
+ /* the ms will prevent from falling into IPS after wakeup */
+ ips_deffer_ms = RTW_PWR_STATE_CHK_INTERVAL;
if (pwrpriv->ips_deny_time < jiffies + rtw_ms_to_systime(ips_deffer_ms))
pwrpriv->ips_deny_time = jiffies + rtw_ms_to_systime(ips_deffer_ms);
diff --git a/drivers/staging/r8188eu/include/rtw_pwrctrl.h b/drivers/staging/r8188eu/include/rtw_pwrctrl.h
index 0a0f7a4c4052..fd301a9f117a 100644
--- a/drivers/staging/r8188eu/include/rtw_pwrctrl.h
+++ b/drivers/staging/r8188eu/include/rtw_pwrctrl.h
@@ -121,9 +121,8 @@ s32 LPS_RF_ON_check(struct adapter *adapter, u32 delay_ms);
void LPS_Enter(struct adapter *adapter);
void LPS_Leave(struct adapter *adapter);
-int _rtw_pwr_wakeup(struct adapter *adapter, u32 ips_defer_ms);
-#define rtw_pwr_wakeup(adapter) \
- _rtw_pwr_wakeup(adapter, RTW_PWR_STATE_CHK_INTERVAL)
+int _rtw_pwr_wakeup(struct adapter *adapter);
+#define rtw_pwr_wakeup(adapter) _rtw_pwr_wakeup(adapter)
int rtw_pm_set_ips(struct adapter *adapter, u8 mode);
int rtw_pm_set_lps(struct adapter *adapter, u8 mode);
--
2.35.1
next prev parent reply other threads:[~2022-04-03 10:37 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-03 10:37 [PATCH 0/4] staging: r8188eu: remove macro rtw_pwr_wakeup() Michael Straube
2022-04-03 10:37 ` [PATCH 1/4] staging: r8188eu: remove unused parameter from _rtw_pwr_wakeup() Michael Straube
2022-04-03 10:37 ` Michael Straube [this message]
2022-04-03 10:37 ` [PATCH 3/4] staging: r8188eu: remove macro rtw_pwr_wakeup() Michael Straube
2022-04-03 10:37 ` [PATCH 4/4] staging: r8188eu: clean up comment for rtw_pwr_wakeup() Michael Straube
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=20220403103713.12883-3-straube.linux@gmail.com \
--to=straube.linux@gmail.com \
--cc=Larry.Finger@lwfinger.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=phil@philpotter.co.uk \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.