Commit f2dca339 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'usb-v5.14-rc1' of... 

Merge tag 'usb-v5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-next

Peter writes:

Some tiny improvements for cdns USB3 drivers, no important things.

* tag 'usb-v5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb:
  usb: cdns3: cdns3-gadget: Use list_move_tail instead of list_del/list_add_tail
  doc: dt-binding: cdns,usb3: Add interrupt-names property under required
  usb: cdnsp: Useless condition has been removed
  usb: cdns3: Corrected comment to align with kernel-doc comment
parents cfb02763 33e99b65

drivers/usb/cdns3/cdns3-gadget.c

+2 −4
Original line number Diff line number Diff line
@@ -430,9 +430,7 @@ static int cdns3_start_all_request(struct cdns3_device *priv_dev, 
		if (ret)

			return ret;



		list_del(&request->list);

		list_add_tail(&request->list,

			      &priv_ep->pending_req_list);

		list_move_tail(&request->list, &priv_ep->pending_req_list);

		if (request->stream_id != 0 || (priv_ep->flags & EP_TDLCHK_EN))

			break;

	}
@@ -484,7 +482,7 @@ static void __cdns3_descmiss_copy_data(struct usb_request *request, 
}



/**

 * cdns3_wa2_descmiss_copy_data copy data from internal requests to

 * cdns3_wa2_descmiss_copy_data - copy data from internal requests to

 * request queued by class driver.

 * @priv_ep: extended endpoint object

 * @request: request object

drivers/usb/cdns3/cdnsp-mem.c

+2 −3
Original line number Diff line number Diff line
@@ -1082,7 +1082,6 @@ void cdnsp_mem_cleanup(struct cdnsp_device *pdev) 
	dma_pool_destroy(pdev->device_pool);

	pdev->device_pool = NULL;



	if (pdev->dcbaa)

	dma_free_coherent(dev, sizeof(*pdev->dcbaa),

			  pdev->dcbaa, pdev->dcbaa->dma);