2023-10-08 02:59:58

by Jinjie Ruan

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 <[email protected]>
---
drivers/net/wireless/realtek/rtw88/usb.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)

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

2023-10-09 05:56:01

by Sascha Hauer

Subject: Re: [PATCH] wifi: rtw88: Remove duplicate NULL check before calling usb_kill/free_urb()

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 <[email protected]>
> ---
> drivers/net/wireless/realtek/rtw88/usb.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)

Acked-by: Sascha Hauer <[email protected]>

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
>
>

--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |

2023-10-11 01:05:23

by Ping-Ke Shih

Subject: RE: [PATCH] wifi: rtw88: Remove duplicate NULL check before calling usb_kill/free_urb()

> -----Original Message-----
> From: Jinjie Ruan <[email protected]>
> Sent: Sunday, October 8, 2023 10:59 AM
> To: [email protected]; Ping-Ke Shih <[email protected]>; Kalle Valo <[email protected]>;
> neo_jou <[email protected]>; Sascha Hauer <[email protected]>; Hans Ulli Kroll
> <[email protected]>
> Cc: [email protected]
> 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 <[email protected]>

Acked-by: Ping-Ke Shih <[email protected]>

2023-10-11 09:18:13

by Kalle Valo

Subject: Re: [PATCH] wifi: rtw88: Remove duplicate NULL check before calling usb_kill/free_urb()

Jinjie Ruan <[email protected]> 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 <[email protected]>
> Acked-by: Sascha Hauer <[email protected]>
> Acked-by: Ping-Ke Shih <[email protected]>

Patch applied to wireless-next.git, thanks.

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

--
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches