2023-01-11 10:49:56

by Martin Kaiser

Subject: [PATCH] staging: r8188eu: remove NULL check for usb_kill_urb

usb_kill_urb handles a NULL parameter. There's no need for NULL checks
before we call usb_kill_urb.

Signed-off-by: Martin Kaiser <[email protected]>
---
drivers/staging/r8188eu/os_dep/usb_ops_linux.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/r8188eu/os_dep/usb_ops_linux.c b/drivers/staging/r8188eu/os_dep/usb_ops_linux.c
index 62106d2f82ad..583533631133 100644
--- a/drivers/staging/r8188eu/os_dep/usb_ops_linux.c
+++ b/drivers/staging/r8188eu/os_dep/usb_ops_linux.c
@@ -29,8 +29,7 @@ void rtw_read_port_cancel(struct adapter *padapter)

for (i = 0; i < NR_RECVBUFF; i++) {
precvbuf->reuse = true;
- if (precvbuf->purb)
- usb_kill_urb(precvbuf->purb);
+ usb_kill_urb(precvbuf->purb);
precvbuf++;
}
}
@@ -153,15 +152,13 @@ void rtw_write_port_cancel(struct adapter *padapter)
padapter->bWritePortCancel = true;

for (i = 0; i < NR_XMITBUFF; i++) {
- if (pxmitbuf->pxmit_urb)
- usb_kill_urb(pxmitbuf->pxmit_urb);
+ usb_kill_urb(pxmitbuf->pxmit_urb);
pxmitbuf++;
}

pxmitbuf = (struct xmit_buf *)padapter->xmitpriv.pxmit_extbuf;
for (i = 0; i < NR_XMIT_EXTBUFF; i++) {
- if (pxmitbuf->pxmit_urb)
- usb_kill_urb(pxmitbuf->pxmit_urb);
+ usb_kill_urb(pxmitbuf->pxmit_urb);
pxmitbuf++;
}
}
--
2.30.2

2023-01-11 22:37:09

by Philipp Hortmann

Subject: Re: [PATCH] staging: r8188eu: remove NULL check for usb_kill_urb

On 1/11/23 11:02, Martin Kaiser wrote:
> usb_kill_urb handles a NULL parameter. There's no need for NULL checks
> before we call usb_kill_urb.
>
> Signed-off-by: Martin Kaiser <[email protected]>
> ---
> drivers/staging/r8188eu/os_dep/usb_ops_linux.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/staging/r8188eu/os_dep/usb_ops_linux.c b/drivers/staging/r8188eu/os_dep/usb_ops_linux.c
> index 62106d2f82ad..583533631133 100644
> --- a/drivers/staging/r8188eu/os_dep/usb_ops_linux.c
> +++ b/drivers/staging/r8188eu/os_dep/usb_ops_linux.c
> @@ -29,8 +29,7 @@ void rtw_read_port_cancel(struct adapter *padapter)
>
> for (i = 0; i < NR_RECVBUFF; i++) {
> precvbuf->reuse = true;
> - if (precvbuf->purb)
> - usb_kill_urb(precvbuf->purb);
> + usb_kill_urb(precvbuf->purb);
> precvbuf++;
> }
> }
> @@ -153,15 +152,13 @@ void rtw_write_port_cancel(struct adapter *padapter)
> padapter->bWritePortCancel = true;
>
> for (i = 0; i < NR_XMITBUFF; i++) {
> - if (pxmitbuf->pxmit_urb)
> - usb_kill_urb(pxmitbuf->pxmit_urb);
> + usb_kill_urb(pxmitbuf->pxmit_urb);
> pxmitbuf++;
> }
>
> pxmitbuf = (struct xmit_buf *)padapter->xmitpriv.pxmit_extbuf;
> for (i = 0; i < NR_XMIT_EXTBUFF; i++) {
> - if (pxmitbuf->pxmit_urb)
> - usb_kill_urb(pxmitbuf->pxmit_urb);
> + usb_kill_urb(pxmitbuf->pxmit_urb);
> pxmitbuf++;
> }
> }


Tested-by: Philipp Hortmann <[email protected]> # Edimax N150