staging: rtl8723bs: Replace manual mutex handling with scoped_guard()
PATCH 1/1 staging: rtl8723bs: Replace manual mutex handling with scoped_guard()
This refactor replaces manual mutex lock/unlock with scoped_guard() in places where early exits use goto. Using scoped_guard() avoids error-prone unlock paths and simplifies control flow.
Signed-off-by Erick Karanja <[email protected]>
--- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 52 +++++++++----------- 1 file changed, 22 insertions(+), 30 deletions(-)
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +22 -30
@@ -599,25 +599,21 @@ void cpwm_int_hdl(struct adapter *padapter, struct reportpwrstate_parm *preportp pwrpriv =adapter_to_pwrctl (padapter); -mutex_lock (&pwrpriv->lock); - -if (pwrpriv->rpwm <PS_STATE_S2 ) - goto exit; + scoped_guard(mutex, &pwrpriv->lock) { +if (pwrpriv->rpwm <PS_STATE_S2 ) +return ; - pwrpriv->cpwm =PS_STATE (preportpwrstate->state); - pwrpriv->cpwm_tog = preportpwrstate->state &PS_TOGGLE ; + pwrpriv->cpwm =PS_STATE (preportpwrstate->state); + pwrpriv->cpwm_tog = preportpwrstate->state &PS_TOGGLE ; -if (pwrpriv->cpwm >=PS_STATE_S2 ) { -if (pwrpriv->alives &CMD_ALIVE ) -complete (&padapter->cmdpriv.cmd_queue_comp); +if (pwrpriv->cpwm >=PS_STATE_S2 ) { +if (pwrpriv->alives &CMD_ALIVE ) +complete (&padapter->cmdpriv.cmd_queue_comp); -if (pwrpriv->alives &XMIT_ALIVE ) -complete (&padapter->xmitpriv.xmit_comp); +if (pwrpriv->alives &XMIT_ALIVE ) +complete (&padapter->xmitpriv.xmit_comp); + } } - -exit: -mutex_unlock (&pwrpriv->lock); - }static void cpwm_event_callback (struct work_struct *work)
@@ -642,11 +638,10 @@ static void rpwmtimeout_workitem_callback(struct work_struct *work) dvobj =pwrctl_to_dvobj (pwrpriv); padapter = dvobj->if1; -mutex_lock (&pwrpriv->lock); -if ((pwrpriv->rpwm == pwrpriv->cpwm) || (pwrpriv->cpwm >=PS_STATE_S2 )) - goto exit; - -mutex_unlock (&pwrpriv->lock); + scoped_guard(mutex, &pwrpriv->lock) { +if ((pwrpriv->rpwm == pwrpriv->cpwm) || (pwrpriv->cpwm >=PS_STATE_S2 )) +return ; + }if (rtw_read8 (padapter,0x100 ) !=0xEA ) {struct reportpwrstate_parm report;
@@ -657,17 +652,14 @@ static void rpwmtimeout_workitem_callback(struct work_struct *work)return ; } -mutex_lock (&pwrpriv->lock); - -if ((pwrpriv->rpwm == pwrpriv->cpwm) || (pwrpriv->cpwm >=PS_STATE_S2 )) - goto exit; - - pwrpriv->brpwmtimeout = true; -rtw_set_rpwm (padapter, pwrpriv->rpwm); - pwrpriv->brpwmtimeout = false; + scoped_guard(mutex, &pwrpriv->lock) { +if ((pwrpriv->rpwm == pwrpriv->cpwm) || (pwrpriv->cpwm >=PS_STATE_S2 )) +return ; -exit: -mutex_unlock (&pwrpriv->lock); + pwrpriv->brpwmtimeout = true; +rtw_set_rpwm (padapter, pwrpriv->rpwm); + pwrpriv->brpwmtimeout = false; + } }/*
Signature · 1 line
2.43.0
Greg KH
maintainerQuoted 3 lines · Erick Karanja
This refactor replaces manual mutex lock/unlock with
scoped_guard()in places where early exits use goto. Usingscoped_guard()avoids error-prone unlock paths and simplifies control flow.
Again, for new code, this is fine. But don't add it to old stuff unless you really have a good reason to do so.
Unless you have the hardware and can test that your change was correct. Do you have such hardware and was it tested?
thanks,
greg k-h