brcmfmac: Remove unnecessary NULL-check.

Message ID 20240211150516.3475-1-d.dulov@aladdin.ru
State New
Headers
Series brcmfmac: Remove unnecessary NULL-check. |

Commit Message

Daniil Dulov Feb. 11, 2024, 3:05 p.m. UTC
  In this case req will never be NULL, so remove unnecessary check.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Fixes: 71bb244ba2fd ("brcm80211: fmac: add USB support for bcm43235/6/8 chipsets")
Signed-off-by: Daniil Dulov <d.dulov@aladdin.ru>
---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
  

Comments

Arend van Spriel Feb. 11, 2024, 7:25 p.m. UTC | #1
On 2/11/2024 4:05 PM, Daniil Dulov wrote:
> In this case req will never be NULL, so remove unnecessary check.
> 
> Found by Linux Verification Center (linuxtesting.org) with SVACE.

Looks good to me, but when do we call things a "fix" and when is 
"improvement" more appropriate.

> Fixes: 71bb244ba2fd ("brcm80211: fmac: add USB support for bcm43235/6/8 chipsets")
Reviewed-by: Arend van Spriel <arend.vanspriel@broadcom.com>
> Signed-off-by: Daniil Dulov <d.dulov@aladdin.ru>
> ---
>   drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
> index 9fb68c2dc7e3..38e4e4f32a39 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
> @@ -455,8 +455,7 @@ brcmf_usbdev_qinit(struct list_head *q, int qsize)
>   	brcmf_err("fail!\n");
>   	while (!list_empty(q)) {
>   		req = list_entry(q->next, struct brcmf_usbreq, list);
> -		if (req)
> -			usb_free_urb(req->urb);
> +		usb_free_urb(req->urb);
>   		list_del(q->next);
>   	}

Ay you are already touching this code you could consider using 
list_for_each_entry_safe().

>   	kfree(reqs);
  
Arend van Spriel Feb. 11, 2024, 7:26 p.m. UTC | #2
On 2/11/2024 8:25 PM, Arend van Spriel wrote:
> On 2/11/2024 4:05 PM, Daniil Dulov wrote:
>> In this case req will never be NULL, so remove unnecessary check.
>>
>> Found by Linux Verification Center (linuxtesting.org) with SVACE.
> 
> Looks good to me, but when do we call things a "fix" and when is 
> "improvement" more appropriate.
> 
>> Fixes: 71bb244ba2fd ("brcm80211: fmac: add USB support for 
>> bcm43235/6/8 chipsets")
> Reviewed-by: Arend van Spriel <arend.vanspriel@broadcom.com>
>> Signed-off-by: Daniil Dulov <d.dulov@aladdin.ru>
>> ---
>>   drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 3 +--
>>   1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c 
>> b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
>> index 9fb68c2dc7e3..38e4e4f32a39 100644
>> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
>> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
>> @@ -455,8 +455,7 @@ brcmf_usbdev_qinit(struct list_head *q, int qsize)
>>       brcmf_err("fail!\n");
>>       while (!list_empty(q)) {
>>           req = list_entry(q->next, struct brcmf_usbreq, list);
>> -        if (req)
>> -            usb_free_urb(req->urb);
>> +        usb_free_urb(req->urb);
>>           list_del(q->next);
>>       }
> 
> Ay you are already touching this code you could consider using 
> list_for_each_entry_safe().

That "Ay you are ..." should be "As you are ...".

>>       kfree(reqs);
  
Kalle Valo Feb. 12, 2024, 7:27 a.m. UTC | #3
Arend van Spriel <arend.vanspriel@broadcom.com> writes:

> On 2/11/2024 4:05 PM, Daniil Dulov wrote:
>> In this case req will never be NULL, so remove unnecessary check.
>> Found by Linux Verification Center (linuxtesting.org) with SVACE.
>
> Looks good to me, but when do we call things a "fix" and when is
> "improvement" more appropriate.
>
>> Fixes: 71bb244ba2fd ("brcm80211: fmac: add USB support for bcm43235/6/8 chipsets")
> Reviewed-by: Arend van Spriel <arend.vanspriel@broadcom.com>

Yeah, this is not a fix and the Fixes tag should be removed.
  
Daniil Dulov Feb. 12, 2024, 7:52 a.m. UTC | #4
Hello!

Thank you for the review! I'll correct the patch and send the 2nd version today.

Daniil Dulov


-----Original Message-----
From: Arend van Spriel [mailto:arend.vanspriel@broadcom.com] 
Sent: Sunday, February 11, 2024 10:27 PM
To: Daniil Dulov <D.Dulov@aladdin.ru>; Kalle Valo <kvalo@codeaurora.org>
Cc: David S. Miller <davem@davemloft.net>; Jakub Kicinski <kuba@kernel.org>; Pieter-Paul Giesberts <pieterpg@broadcom.com>; Franky (Zhenhui) Lin <frankyl@broadcom.com>; John W. Linville <linville@tuxdriver.com>; Kan Yan <kanyan@broadcom.com>; linux-wireless@vger.kernel.org; brcm80211-dev-list.pdl@broadcom.com; SHA-cyfmac-dev-list@infineon.com; netdev@vger.kernel.org; linux-kernel@vger.kernel.org; lvc-project@linuxtesting.org
Subject: Re: [PATCH] brcmfmac: Remove unnecessary NULL-check.

On 2/11/2024 8:25 PM, Arend van Spriel wrote:
> On 2/11/2024 4:05 PM, Daniil Dulov wrote:
>> In this case req will never be NULL, so remove unnecessary check.
>>
>> Found by Linux Verification Center (linuxtesting.org) with SVACE.
> 
> Looks good to me, but when do we call things a "fix" and when is 
> "improvement" more appropriate.
> 
>> Fixes: 71bb244ba2fd ("brcm80211: fmac: add USB support for 
>> bcm43235/6/8 chipsets")
> Reviewed-by: Arend van Spriel <arend.vanspriel@broadcom.com>
>> Signed-off-by: Daniil Dulov <d.dulov@aladdin.ru>
>> ---
>>   drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 3 +--
>>   1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c 
>> b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
>> index 9fb68c2dc7e3..38e4e4f32a39 100644
>> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
>> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
>> @@ -455,8 +455,7 @@ brcmf_usbdev_qinit(struct list_head *q, int qsize)
>>       brcmf_err("fail!\n");
>>       while (!list_empty(q)) {
>>           req = list_entry(q->next, struct brcmf_usbreq, list);
>> -        if (req)
>> -            usb_free_urb(req->urb);
>> +        usb_free_urb(req->urb);
>>           list_del(q->next);
>>       }
> 
> Ay you are already touching this code you could consider using 
> list_for_each_entry_safe().

That "Ay you are ..." should be "As you are ...".

>>       kfree(reqs);
  

Patch

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
index 9fb68c2dc7e3..38e4e4f32a39 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
@@ -455,8 +455,7 @@  brcmf_usbdev_qinit(struct list_head *q, int qsize)
 	brcmf_err("fail!\n");
 	while (!list_empty(q)) {
 		req = list_entry(q->next, struct brcmf_usbreq, list);
-		if (req)
-			usb_free_urb(req->urb);
+		usb_free_urb(req->urb);
 		list_del(q->next);
 	}
 	kfree(reqs);