diff mbox series

wifi: rtw88: Remove duplicate NULL check before calling usb_kill/free_urb()

Message ID 20231008025852.1239450-1-ruanjinjie@huawei.com
State New
Headers show
Series wifi: rtw88: Remove duplicate NULL check before calling usb_kill/free_urb() | expand

Commit Message

Jinjie Ruan Oct. 8, 2023, 2:58 a.m. UTC
Both usb_kill_urb() and usb_free_urb() do the NULL check itself, so there
is no need to duplicate it prior to calling.

Fixes: a82dfd33d123 ("wifi: rtw88: Add common USB chip support")
Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
---
 drivers/net/wireless/realtek/rtw88/usb.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

Comments

Sascha Hauer Oct. 9, 2023, 5:55 a.m. UTC | #1
On Sun, Oct 08, 2023 at 10:58:52AM +0800, Jinjie Ruan wrote:
> Both usb_kill_urb() and usb_free_urb() do the NULL check itself, so there
> is no need to duplicate it prior to calling.
> 
> Fixes: a82dfd33d123 ("wifi: rtw88: Add common USB chip support")
> Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
> ---
>  drivers/net/wireless/realtek/rtw88/usb.c | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)

Acked-by: Sascha Hauer <s.hauer@pengutronix.de>

Sascha

> 
> diff --git a/drivers/net/wireless/realtek/rtw88/usb.c b/drivers/net/wireless/realtek/rtw88/usb.c
> index d879d7e3dc81..e6ab1ac6d709 100644
> --- a/drivers/net/wireless/realtek/rtw88/usb.c
> +++ b/drivers/net/wireless/realtek/rtw88/usb.c
> @@ -611,8 +611,7 @@ static void rtw_usb_cancel_rx_bufs(struct rtw_usb *rtwusb)
>  
>  	for (i = 0; i < RTW_USB_RXCB_NUM; i++) {
>  		rxcb = &rtwusb->rx_cb[i];
> -		if (rxcb->rx_urb)
> -			usb_kill_urb(rxcb->rx_urb);
> +		usb_kill_urb(rxcb->rx_urb);
>  	}
>  }
>  
> @@ -623,10 +622,8 @@ static void rtw_usb_free_rx_bufs(struct rtw_usb *rtwusb)
>  
>  	for (i = 0; i < RTW_USB_RXCB_NUM; i++) {
>  		rxcb = &rtwusb->rx_cb[i];
> -		if (rxcb->rx_urb) {
> -			usb_kill_urb(rxcb->rx_urb);
> -			usb_free_urb(rxcb->rx_urb);
> -		}
> +		usb_kill_urb(rxcb->rx_urb);
> +		usb_free_urb(rxcb->rx_urb);
>  	}
>  }
>  
> -- 
> 2.34.1
> 
>
Ping-Ke Shih Oct. 11, 2023, 1:03 a.m. UTC | #2
> -----Original Message-----
> From: Jinjie Ruan <ruanjinjie@huawei.com>
> Sent: Sunday, October 8, 2023 10:59 AM
> To: linux-wireless@vger.kernel.org; Ping-Ke Shih <pkshih@realtek.com>; Kalle Valo <kvalo@kernel.org>;
> neo_jou <neo_jou@realtek.com>; Sascha Hauer <s.hauer@pengutronix.de>; Hans Ulli Kroll
> <linux@ulli-kroll.de>
> Cc: ruanjinjie@huawei.com
> Subject: [PATCH] wifi: rtw88: Remove duplicate NULL check before calling usb_kill/free_urb()
> 
> Both usb_kill_urb() and usb_free_urb() do the NULL check itself, so there
> is no need to duplicate it prior to calling.
> 
> Fixes: a82dfd33d123 ("wifi: rtw88: Add common USB chip support")
> Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>

Acked-by: Ping-Ke Shih <pkshih@realtek.com>
diff mbox series

Patch

diff --git a/drivers/net/wireless/realtek/rtw88/usb.c b/drivers/net/wireless/realtek/rtw88/usb.c
index d879d7e3dc81..e6ab1ac6d709 100644
--- a/drivers/net/wireless/realtek/rtw88/usb.c
+++ b/drivers/net/wireless/realtek/rtw88/usb.c
@@ -611,8 +611,7 @@  static void rtw_usb_cancel_rx_bufs(struct rtw_usb *rtwusb)
 
 	for (i = 0; i < RTW_USB_RXCB_NUM; i++) {
 		rxcb = &rtwusb->rx_cb[i];
-		if (rxcb->rx_urb)
-			usb_kill_urb(rxcb->rx_urb);
+		usb_kill_urb(rxcb->rx_urb);
 	}
 }
 
@@ -623,10 +622,8 @@  static void rtw_usb_free_rx_bufs(struct rtw_usb *rtwusb)
 
 	for (i = 0; i < RTW_USB_RXCB_NUM; i++) {
 		rxcb = &rtwusb->rx_cb[i];
-		if (rxcb->rx_urb) {
-			usb_kill_urb(rxcb->rx_urb);
-			usb_free_urb(rxcb->rx_urb);
-		}
+		usb_kill_urb(rxcb->rx_urb);
+		usb_free_urb(rxcb->rx_urb);
 	}
 }