2016-03-04 13:08:36

by Cihangir Akturk

[permalink] [raw]
Subject: drivers: staging: rtl8723au: remove unneeded null test

null test on pnetwork removed, because the iterator variable
list_for_each_entry_safe cannot be null.

This commit fixes the following error reported by coccinelle:

drivers/staging/rtl8723au/core/rtw_mlme.c:1621:7-15: ERROR: iterator
variable bound on line 1620 cannot be NULL

Signed-off-by: Cihangir Akturk <[email protected]>
---
drivers/staging/rtl8723au/core/rtw_mlme.c | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/rtl8723au/core/rtw_mlme.c b/drivers/staging/rtl8723au/core/rtw_mlme.c
index 3adda55..a786fc4 100644
--- a/drivers/staging/rtl8723au/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723au/core/rtw_mlme.c
@@ -1617,19 +1617,10 @@ rtw_select_candidate_from_queue(struct mlme_priv *pmlmepriv)

spin_lock_bh(&pmlmepriv->scanned_queue.lock);
phead = get_list_head(queue);
- list_for_each_entry_safe(pnetwork, ptmp, phead, list) {
- if (!pnetwork) {
- RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,
- "%s: return _FAIL:(pnetwork == NULL)\n",
- __func__);
- goto exit;
- }
-
+ list_for_each_entry_safe(pnetwork, ptmp, phead, list)
rtw_check_join_candidate(pmlmepriv, &candidate, pnetwork);
- }
-
-exit:
spin_unlock_bh(&pmlmepriv->scanned_queue.lock);
+
return candidate;
}

--
2.1.4



2016-03-04 13:41:50

by Cihangir Akturk

[permalink] [raw]
Subject: Re: drivers: staging: rtl8723au: remove unneeded null test

On Fri, Mar 04, 2016 at 03:08:19PM +0200, Cihangir Akturk wrote:
> null test on pnetwork removed, because the iterator variable
> list_for_each_entry_safe cannot be null.
>
> This commit fixes the following error reported by coccinelle:
>
> drivers/staging/rtl8723au/core/rtw_mlme.c:1621:7-15: ERROR: iterator
> variable bound on line 1620 cannot be NULL
>
> Signed-off-by: Cihangir Akturk <[email protected]>
> ---
> drivers/staging/rtl8723au/core/rtw_mlme.c | 13 ++-----------
> 1 file changed, 2 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/staging/rtl8723au/core/rtw_mlme.c b/drivers/staging/rtl8723au/core/rtw_mlme.c
> index 3adda55..a786fc4 100644
> --- a/drivers/staging/rtl8723au/core/rtw_mlme.c
> +++ b/drivers/staging/rtl8723au/core/rtw_mlme.c
> @@ -1617,19 +1617,10 @@ rtw_select_candidate_from_queue(struct mlme_priv *pmlmepriv)
>
> spin_lock_bh(&pmlmepriv->scanned_queue.lock);
> phead = get_list_head(queue);
> - list_for_each_entry_safe(pnetwork, ptmp, phead, list) {
> - if (!pnetwork) {
> - RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,
> - "%s: return _FAIL:(pnetwork == NULL)\n",
> - __func__);
> - goto exit;
> - }
> -
> + list_for_each_entry_safe(pnetwork, ptmp, phead, list)
> rtw_check_join_candidate(pmlmepriv, &candidate, pnetwork);
> - }
> -
> -exit:
> spin_unlock_bh(&pmlmepriv->scanned_queue.lock);
> +
> return candidate;
> }
>
> --
> 2.1.4
>

Opps. It seems I've made a mistake by not adding PATCH suffix. Please
ignore this patch, I will resend it in correct format.

Sorry for the noise.