From: Priit Laes <plaes@plaes.org>
Cc: "Priit Laes" <plaes@plaes.org>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Archit Anant" <architanant5@gmail.com>,
"Minu Jin" <s9430939@naver.com>,
"Andy Shevchenko" <andriy.shevchenko@intel.com>,
"Ignacio Pena" <ignacio.pena87@gmail.com>,
"Yuvraj Singh Chauhan" <ysinghcin@gmail.com>,
"JJ Strnad" <strnad.jj@gmail.com>,
"Dan Carpenter" <dan.carpenter@linaro.org>,
"Abraham Samuel Adekunle" <abrahamadekunle50@gmail.com>,
"Rogério Fernandes Pereira" <rfp2005@gmail.com>,
"Artur Stupa" <arthur.stupa@gmail.com>,
"Ethan Tidmore" <ethantidmore06@gmail.com>,
"Ingo Molnar" <mingo@kernel.org>,
"Zhuoheng Li" <lizhuoheng@kylinos.cn>,
"Thomas Gleixner" <tglx@kernel.org>,
"Sun Jian" <sun.jian.kdev@gmail.com>,
"Akiyoshi Kurita" <weibu@redadmin.org>,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: [PATCH 08/11] staging: rtl8723bs: Drop workqueue wrapper functions
Date: Fri, 20 Feb 2026 18:15:19 +0200 [thread overview]
Message-ID: <20260220161611.2398915-9-plaes@plaes.org> (raw)
In-Reply-To: <20260220161611.2398915-1-plaes@plaes.org>
Signed-off-by: Priit Laes <plaes@plaes.org>
---
drivers/staging/rtl8723bs/core/rtw_cmd.c | 4 ++--
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 6 +++---
drivers/staging/rtl8723bs/hal/sdio_ops.c | 4 ++--
.../rtl8723bs/include/osdep_service_linux.h | 15 ---------------
4 files changed, 7 insertions(+), 22 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c
index b2e7f479f72b..d0694a659259 100644
--- a/drivers/staging/rtl8723bs/core/rtw_cmd.c
+++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c
@@ -201,7 +201,7 @@ int rtw_init_evt_priv(struct evt_priv *pevtpriv)
atomic_set(&pevtpriv->event_seq, 0);
pevtpriv->evt_done_cnt = 0;
- _init_workitem(&pevtpriv->c2h_wk, c2h_wk_callback, NULL);
+ INIT_WORK(&pevtpriv->c2h_wk, c2h_wk_callback);
pevtpriv->c2h_wk_alive = false;
pevtpriv->c2h_queue = rtw_cbuf_alloc(C2H_QUEUE_MAX_LEN + 1);
if (!pevtpriv->c2h_queue)
@@ -212,7 +212,7 @@ int rtw_init_evt_priv(struct evt_priv *pevtpriv)
void _rtw_free_evt_priv(struct evt_priv *pevtpriv)
{
- _cancel_workitem_sync(&pevtpriv->c2h_wk);
+ cancel_work_sync(&pevtpriv->c2h_wk);
while (pevtpriv->c2h_wk_alive)
msleep(10);
diff --git a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
index 1c9e02732687..c93c7357b3f0 100644
--- a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
+++ b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
@@ -670,7 +670,7 @@ static void pwr_rpwm_timeout_handler(struct timer_list *t)
if ((pwrpriv->rpwm == pwrpriv->cpwm) || (pwrpriv->cpwm >= PS_STATE_S2))
return;
- _set_workitem(&pwrpriv->rpwmtimeoutwi);
+ schedule_work(&pwrpriv->rpwmtimeoutwi);
}
static inline void register_task_alive(struct pwrctrl_priv *pwrctrl, u32 tag)
@@ -971,11 +971,11 @@ void rtw_init_pwrctrl_priv(struct adapter *padapter)
rtw_hal_set_hwreg(padapter, HW_VAR_SET_RPWM, (u8 *)(&pwrctrlpriv->rpwm));
- _init_workitem(&pwrctrlpriv->cpwm_event, cpwm_event_callback, NULL);
+ INIT_WORK(&pwrctrlpriv->cpwm_event, cpwm_event_callback);
pwrctrlpriv->brpwmtimeout = false;
pwrctrlpriv->adapter = padapter;
- _init_workitem(&pwrctrlpriv->rpwmtimeoutwi, rpwmtimeout_workitem_callback, NULL);
+ INIT_WORK(&pwrctrlpriv->rpwmtimeoutwi, rpwmtimeout_workitem_callback);
timer_setup(&pwrctrlpriv->pwr_rpwm_timer, pwr_rpwm_timeout_handler, 0);
timer_setup(&pwrctrlpriv->pwr_state_check_timer,
pwr_state_check_handler, 0);
diff --git a/drivers/staging/rtl8723bs/hal/sdio_ops.c b/drivers/staging/rtl8723bs/hal/sdio_ops.c
index 6bfb8c0e519c..ea373276f9cd 100644
--- a/drivers/staging/rtl8723bs/hal/sdio_ops.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_ops.c
@@ -876,7 +876,7 @@ void sd_int_dpc(struct adapter *adapter)
SdioLocalCmd52Read1Byte(adapter, SDIO_REG_HCPWM1_8723B);
- _set_workitem(&(pwrctl->cpwm_event));
+ schedule_work(&pwrctl->cpwm_event);
}
if (hal->sdio_hisr & SDIO_HISR_TXERR) {
@@ -912,7 +912,7 @@ void sd_int_dpc(struct adapter *adapter)
} else {
/* Error handling for malloc fail */
rtw_cbuf_push(adapter->evtpriv.c2h_queue, NULL);
- _set_workitem(&adapter->evtpriv.c2h_wk);
+ schedule_work(&adapter->evtpriv.c2h_wk);
}
}
diff --git a/drivers/staging/rtl8723bs/include/osdep_service_linux.h b/drivers/staging/rtl8723bs/include/osdep_service_linux.h
index c8274da940ff..ebaa2f1d4af7 100644
--- a/drivers/staging/rtl8723bs/include/osdep_service_linux.h
+++ b/drivers/staging/rtl8723bs/include/osdep_service_linux.h
@@ -58,21 +58,6 @@ static inline void _set_timer(struct timer_list *ptimer, u32 delay_time)
mod_timer(ptimer, (jiffies + (delay_time * HZ / 1000)));
}
-static inline void _init_workitem(struct work_struct *pwork, void *pfunc, void *cntx)
-{
- INIT_WORK(pwork, pfunc);
-}
-
-static inline void _set_workitem(struct work_struct *pwork)
-{
- schedule_work(pwork);
-}
-
-static inline void _cancel_workitem_sync(struct work_struct *pwork)
-{
- cancel_work_sync(pwork);
-}
-
static inline int rtw_netif_queue_stopped(struct net_device *pnetdev)
{
return (netif_tx_queue_stopped(netdev_get_tx_queue(pnetdev, 0)) &&
--
2.53.0
next prev parent reply other threads:[~2026-02-20 16:17 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20260220161611.2398915-1-plaes@plaes.org>
2026-02-20 16:15 ` [PATCH 01/11] staging: stl8723bs: Use common round_up macro Priit Laes
2026-02-20 16:15 ` [PATCH 02/11] staging: rtl8723bs: Remove unused BIT32..BIT36 definitions Priit Laes
2026-02-20 16:15 ` [PATCH 03/11] staging: rtl8723bs: Drop empty rtw_bug_check function Priit Laes
2026-02-20 16:15 ` [PATCH 04/11] staging: rtl8723bs: Remove unused rtw_sprintf macro Priit Laes
2026-02-20 16:15 ` [PATCH 05/11] staging: rtl8723bs: Drop unused _kfree(...) declaration Priit Laes
2026-02-20 16:15 ` [PATCH 06/11] staging: rtl8723bs: Get rid of unused _rtw_init_queue Priit Laes
2026-02-20 16:15 ` [PATCH 07/11] staging: rtl8723bs: Drop unused NDEV-related formatting macros Priit Laes
2026-02-20 16:15 ` Priit Laes [this message]
2026-02-20 16:15 ` [PATCH 09/11] staging: rtl8273bs: Reduce useless function wrapping in regulator code Priit Laes
2026-02-20 16:15 ` [PATCH 10/11] staging: rtl8723bs: Remove useless wrapper functions in rtw_cmd.c Priit Laes
2026-02-20 18:42 ` Ethan Tidmore
2026-02-20 17:29 ` [PATCH 11/11] staging: rtl8723bs: rtw_ieee80211: Reduce global symbols Priit Laes
2026-02-20 23:50 ` kernel test robot
2026-02-21 1:25 ` kernel test robot
2026-02-21 9:47 ` Dan Carpenter
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=20260220161611.2398915-9-plaes@plaes.org \
--to=plaes@plaes.org \
--cc=abrahamadekunle50@gmail.com \
--cc=andriy.shevchenko@intel.com \
--cc=architanant5@gmail.com \
--cc=arthur.stupa@gmail.com \
--cc=dan.carpenter@linaro.org \
--cc=ethantidmore06@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=ignacio.pena87@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=lizhuoheng@kylinos.cn \
--cc=mingo@kernel.org \
--cc=rfp2005@gmail.com \
--cc=s9430939@naver.com \
--cc=strnad.jj@gmail.com \
--cc=sun.jian.kdev@gmail.com \
--cc=tglx@kernel.org \
--cc=weibu@redadmin.org \
--cc=ysinghcin@gmail.com \
/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