2019-05-29 20:56:29

by Guenter Roeck

Subject: [PATCH] Revert "usb: dwc2: host: Setting qtd to NULL after freeing it"

This reverts commit b0d659022e5c96ee5c4bd62d22d3da2d66de306b.

The reverted commit does nothing but adding two unnecessary lines
of code. It sets a local variable to NULL in two functions, but
that variable is not used anywhere in the rest of those functions.
This is just confusing, so let's remove it.

Cc: Vardan Mikayelyan <[email protected]>
Cc: John Youn <[email protected]>
Cc: Douglas Anderson <[email protected]>
Cc: Felipe Balbi <[email protected]>
Signed-off-by: Guenter Roeck <[email protected]>
---
drivers/usb/dwc2/hcd.c | 1 -
drivers/usb/dwc2/hcd.h | 1 -
2 files changed, 2 deletions(-)

diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
index b50ec3714fd8..bca64b0d4d15 100644
--- a/drivers/usb/dwc2/hcd.c
+++ b/drivers/usb/dwc2/hcd.c
@@ -4676,7 +4676,6 @@ static int _dwc2_hcd_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
spin_unlock_irqrestore(&hsotg->lock, flags);
urb->hcpriv = NULL;
kfree(qtd);
- qtd = NULL;
fail1:
if (qh_allocated) {
struct dwc2_qtd *qtd2, *qtd2_tmp;
diff --git a/drivers/usb/dwc2/hcd.h b/drivers/usb/dwc2/hcd.h
index c089ffa1f0a8..f6bc48432b04 100644
--- a/drivers/usb/dwc2/hcd.h
+++ b/drivers/usb/dwc2/hcd.h
@@ -574,7 +574,6 @@ static inline void dwc2_hcd_qtd_unlink_and_free(struct dwc2_hsotg *hsotg,
{
list_del(&qtd->qtd_list_entry);
kfree(qtd);
- qtd = NULL;
}

/* Descriptor DMA support functions */
--
2.7.4

2019-05-29 21:03:08

by Doug Anderson

Subject: Re: [PATCH] Revert "usb: dwc2: host: Setting qtd to NULL after freeing it"

Hi,

On Wed, May 29, 2019 at 1:54 PM Guenter Roeck <[email protected]> wrote:
>
> This reverts commit b0d659022e5c96ee5c4bd62d22d3da2d66de306b.
>
> The reverted commit does nothing but adding two unnecessary lines
> of code. It sets a local variable to NULL in two functions, but
> that variable is not used anywhere in the rest of those functions.
> This is just confusing, so let's remove it.
>
> Cc: Vardan Mikayelyan <[email protected]>
> Cc: John Youn <[email protected]>
> Cc: Douglas Anderson <[email protected]>
> Cc: Felipe Balbi <[email protected]>
> Signed-off-by: Guenter Roeck <[email protected]>
> ---
> drivers/usb/dwc2/hcd.c | 1 -
> drivers/usb/dwc2/hcd.h | 1 -
> 2 files changed, 2 deletions(-)

Reviewed-by: Douglas Anderson <[email protected]>

2019-05-30 14:24:23

by Minas Harutyunyan

Subject: Re: [PATCH] Revert "usb: dwc2: host: Setting qtd to NULL after freeing it"

On 5/30/2019 12:55 AM, Guenter Roeck wrote:
> This reverts commit b0d659022e5c96ee5c4bd62d22d3da2d66de306b.
>
> The reverted commit does nothing but adding two unnecessary lines
> of code. It sets a local variable to NULL in two functions, but
> that variable is not used anywhere in the rest of those functions.
> This is just confusing, so let's remove it.
>
> Cc: Vardan Mikayelyan <[email protected]>
> Cc: John Youn <[email protected]>
> Cc: Douglas Anderson <[email protected]>
> Cc: Felipe Balbi <[email protected]>
> Signed-off-by: Guenter Roeck <[email protected]>

Acked-by: Minas Harutyunyan <[email protected]>


> ---
> drivers/usb/dwc2/hcd.c | 1 -
> drivers/usb/dwc2/hcd.h | 1 -
> 2 files changed, 2 deletions(-)
>
> diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
> index b50ec3714fd8..bca64b0d4d15 100644
> --- a/drivers/usb/dwc2/hcd.c
> +++ b/drivers/usb/dwc2/hcd.c
> @@ -4676,7 +4676,6 @@ static int _dwc2_hcd_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
> spin_unlock_irqrestore(&hsotg->lock, flags);
> urb->hcpriv = NULL;
> kfree(qtd);
> - qtd = NULL;
> fail1:
> if (qh_allocated) {
> struct dwc2_qtd *qtd2, *qtd2_tmp;
> diff --git a/drivers/usb/dwc2/hcd.h b/drivers/usb/dwc2/hcd.h
> index c089ffa1f0a8..f6bc48432b04 100644
> --- a/drivers/usb/dwc2/hcd.h
> +++ b/drivers/usb/dwc2/hcd.h
> @@ -574,7 +574,6 @@ static inline void dwc2_hcd_qtd_unlink_and_free(struct dwc2_hsotg *hsotg,
> {
> list_del(&qtd->qtd_list_entry);
> kfree(qtd);
> - qtd = NULL;
> }
>
> /* Descriptor DMA support functions */
>