Messages in this thread | | | Date | Tue, 12 Apr 2022 16:36:24 -0700 | From | Ira Weiny <> | Subject | Re: [PATCH 2/3] staging: r8188eu: combine both sides of conditional statement |
| |
On Sun, Apr 03, 2022 at 02:17:05PM -0500, Rebecca Mckeever wrote: > Both sides of conditional statement are the same except for the comment. > Additional instance found with git grep. > > Suggested-by: Dan Carpenter <dan.carpenter@oracle.com> > Signed-off-by: Rebecca Mckeever <remckee0@gmail.com>
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
> --- > drivers/staging/r8188eu/core/rtw_cmd.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/drivers/staging/r8188eu/core/rtw_cmd.c b/drivers/staging/r8188eu/core/rtw_cmd.c > index da455eb4d8cb..2d316a6c8294 100644 > --- a/drivers/staging/r8188eu/core/rtw_cmd.c > +++ b/drivers/staging/r8188eu/core/rtw_cmd.c > @@ -1411,11 +1411,9 @@ void rtw_survey_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd) > { > struct mlme_priv *pmlmepriv = &padapter->mlmepriv; > > - if (pcmd->res == H2C_DROPPED) { > + if (pcmd->res != H2C_SUCCESS) { > /* TODO: cancel timer and do timeout handler directly... */ > _set_timer(&pmlmepriv->scan_to_timer, 1); > - } else if (pcmd->res != H2C_SUCCESS) { > - _set_timer(&pmlmepriv->scan_to_timer, 1); > } > > /* free cmd */ > @@ -1445,11 +1443,9 @@ void rtw_joinbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd) > { > struct mlme_priv *pmlmepriv = &padapter->mlmepriv; > > - if (pcmd->res == H2C_DROPPED) { > + if (pcmd->res != H2C_SUCCESS) { > /* TODO: cancel timer and do timeout handler directly... */ > _set_timer(&pmlmepriv->assoc_timer, 1); > - } else if (pcmd->res != H2C_SUCCESS) { > - _set_timer(&pmlmepriv->assoc_timer, 1); > } > > rtw_free_cmd_obj(pcmd); > -- > 2.32.0 >
| |