[linux-yocto] [PATCH][linux-yocto-4.4] usb: dwc3: ep0: Fix merge

[Bruce Ashfield]

On 2017-03-17 5:10 PM, California Sullivan wrote:
> The call to trace_dwc3_prepare_trb() was moved into the
> dwc3_ep0_prepare_one_trb() function in patch ecd4ad9ab7 "usb: dwc3: ep0:
> add dwc3_ep0_prepare_one_trb()", but it somehow got left behind in the
> merge.
>
> Signed-off-by: California Sullivan <california.l.sullivan at intel.com>
> ---
> This is intended for standard/intel/base, which then needs merged into
> the other Intel branches.
>

merged.

I recall a conflict in that file when doing updates, so it is likely
that I just resolved it incorrectly!

Bruce

>  drivers/usb/dwc3/ep0.c | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c
> index 0aa0c8c..ed8afa0 100644
> --- a/drivers/usb/dwc3/ep0.c
> +++ b/drivers/usb/dwc3/ep0.c
> @@ -101,8 +101,6 @@ static int dwc3_ep0_start_trans(struct dwc3 *dwc, u8 epnum)
>  	params.param0 = upper_32_bits(dwc->ep0_trb_addr);
>  	params.param1 = lower_32_bits(dwc->ep0_trb_addr);
>
> -	trace_dwc3_prepare_trb(dep, trb);
> -
>  	ret = dwc3_send_gadget_ep_cmd(dep, DWC3_DEPCMD_STARTTRANSFER, &params);
>  	if (ret < 0) {
>  		dwc3_trace(trace_dwc3_ep0, "%s STARTTRANSFER failed",
>