Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69defe04 authored by Mathias Nyman's avatar Mathias Nyman Committed by Greg Kroah-Hartman
Browse files

xhci: cleanup finish_td function 



Remove unnecessary else after return, dropping extra indentation depth.
No functional changes.

Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c00552eb

drivers/usb/host/xhci-ring.c

+49 −56
Original line number Diff line number Diff line
@@ -1813,15 +1813,14 @@ static int finish_td(struct xhci_hcd *xhci, struct xhci_td *td, 
	if (skip)

		goto td_cleanup;



	if (trb_comp_code == COMP_STOP_INVAL ||

			trb_comp_code == COMP_STOP) {

	if (trb_comp_code == COMP_STOP_INVAL || trb_comp_code == COMP_STOP) {

		/* The Endpoint Stop Command completion will take care of any

		 * stopped TDs.  A stopped TD may be restarted, so don't update

		 * the ring dequeue pointer or take this TD off any lists yet.

		 */

		ep->stopped_td = td;

		return 0;

	} else {

	}

	if (trb_comp_code == COMP_STALL ||

		xhci_requires_manual_halt_cleanup(xhci, ep_ctx,

						trb_comp_code)) {
@@ -1830,9 +1829,8 @@ static int finish_td(struct xhci_hcd *xhci, struct xhci_td *td, 
		 * dequeue pointer past the TD.

		 * The class driver clears the device side halt later.

		 */

			xhci_cleanup_halted_endpoint(xhci,

					slot_id, ep_index, ep_ring->stream_id,

					td, event_trb);

		xhci_cleanup_halted_endpoint(xhci, slot_id, ep_index,

					ep_ring->stream_id, td, event_trb);

	} else {

		/* Update ring dequeue pointer */

		while (ep_ring->dequeue != td->last_trb)
@@ -1846,15 +1844,12 @@ static int finish_td(struct xhci_hcd *xhci, struct xhci_td *td, 
	urb_priv = urb->hcpriv;



	/* Do one last check of the actual transfer length.

		 * If the host controller said we transferred more data than

		 * the buffer length, urb->actual_length will be a very big

		 * number (since it's unsigned).  Play it safe and say we didn't

		 * transfer anything.

	 * If the host controller said we transferred more data than the buffer

	 * length, urb->actual_length will be a very big number (since it's

	 * unsigned).  Play it safe and say we didn't transfer anything.

	 */

	if (urb->actual_length > urb->transfer_buffer_length) {

			xhci_warn(xhci, "URB transfer length is wrong, "

					"xHC issue? req. len = %u, "

					"act. len = %u\n",

		xhci_warn(xhci, "URB transfer length is wrong, xHC issue? req. len = %u, act. len = %u\n",

			urb->transfer_buffer_length,

			urb->actual_length);

		urb->actual_length = 0;
@@ -1874,14 +1869,12 @@ static int finish_td(struct xhci_hcd *xhci, struct xhci_td *td, 
		ret = 1;

		if (usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS) {

			xhci_to_hcd(xhci)->self.bandwidth_isoc_reqs--;

				if (xhci_to_hcd(xhci)->self.bandwidth_isoc_reqs

					== 0) {

			if (xhci_to_hcd(xhci)->self.bandwidth_isoc_reqs == 0) {

				if (xhci->quirks & XHCI_AMD_PLL_FIX)

					usb_amd_quirk_pll_enable();

			}

		}

	}

	}



	return ret;

}