Commit 7c93fdf0 authored by Nishka Dasgupta's avatar Nishka Dasgupta Committed by Greg Kroah-Hartman

staging: rtl8712: r8712_register_cmd_alive(): Change return values

Change return values of r8712_register_cmd_alive from _SUCCESS and _FAIL
to 0 and -EINVAL.
Change the return type of this function from sint to int.
Modify its call site to check for 0 instead of _SUCCESS.
Signed-off-by: default avatarNishka Dasgupta <nishkadg.linux@gmail.com>
Link: https://lore.kernel.org/r/20190722092341.21030-4-nishkadg.linux@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8a73a8c4
...@@ -311,7 +311,7 @@ int r8712_cmd_thread(void *context) ...@@ -311,7 +311,7 @@ int r8712_cmd_thread(void *context)
break; break;
if (padapter->driver_stopped || padapter->surprise_removed) if (padapter->driver_stopped || padapter->surprise_removed)
break; break;
if (r8712_register_cmd_alive(padapter) != _SUCCESS) if (r8712_register_cmd_alive(padapter))
continue; continue;
_next: _next:
pcmd = r8712_dequeue_cmd(&pcmdpriv->cmd_queue); pcmd = r8712_dequeue_cmd(&pcmdpriv->cmd_queue);
......
...@@ -184,19 +184,19 @@ void r8712_init_pwrctrl_priv(struct _adapter *padapter) ...@@ -184,19 +184,19 @@ void r8712_init_pwrctrl_priv(struct _adapter *padapter)
* will raise the cpwm to be greater than or equal to P2. * will raise the cpwm to be greater than or equal to P2.
* Calling Context: Passive * Calling Context: Passive
* Return Value: * Return Value:
* _SUCCESS: r8712_cmd_thread can issue cmds to firmware afterwards. * 0: r8712_cmd_thread can issue cmds to firmware afterwards.
* _FAIL: r8712_cmd_thread can not do anything. * -EINVAL: r8712_cmd_thread can not do anything.
*/ */
sint r8712_register_cmd_alive(struct _adapter *padapter) int r8712_register_cmd_alive(struct _adapter *padapter)
{ {
uint res = _SUCCESS; int res = 0;
struct pwrctrl_priv *pwrctrl = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrctrl = &padapter->pwrctrlpriv;
mutex_lock(&pwrctrl->mutex_lock); mutex_lock(&pwrctrl->mutex_lock);
register_task_alive(pwrctrl, CMD_ALIVE); register_task_alive(pwrctrl, CMD_ALIVE);
if (pwrctrl->cpwm < PS_STATE_S2) { if (pwrctrl->cpwm < PS_STATE_S2) {
r8712_set_rpwm(padapter, PS_STATE_S3); r8712_set_rpwm(padapter, PS_STATE_S3);
res = _FAIL; res = -EINVAL;
} }
mutex_unlock(&pwrctrl->mutex_lock); mutex_unlock(&pwrctrl->mutex_lock);
return res; return res;
......
...@@ -104,7 +104,7 @@ struct pwrctrl_priv { ...@@ -104,7 +104,7 @@ struct pwrctrl_priv {
}; };
void r8712_init_pwrctrl_priv(struct _adapter *adapter); void r8712_init_pwrctrl_priv(struct _adapter *adapter);
sint r8712_register_cmd_alive(struct _adapter *padapter); int r8712_register_cmd_alive(struct _adapter *padapter);
void r8712_unregister_cmd_alive(struct _adapter *padapter); void r8712_unregister_cmd_alive(struct _adapter *padapter);
void r8712_cpwm_int_hdl(struct _adapter *padapter, void r8712_cpwm_int_hdl(struct _adapter *padapter,
struct reportpwrstate_parm *preportpwrstate); struct reportpwrstate_parm *preportpwrstate);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment