Commit 750645f8 authored by Sarah Sharp's avatar Sarah Sharp Committed by Greg Kroah-Hartman
Browse files

xhci: Refactor endpoint limit checking. 



Move the code to check whether we've reached the host controller's limit
on the number of endpoints out of the two conditional statements, to
remove duplicate code.

Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent fe30182c

drivers/usb/host/xhci.c

+14 −18
Original line number Diff line number Diff line
@@ -1765,8 +1765,12 @@ static int xhci_configure_endpoint(struct xhci_hcd *xhci, 


	spin_lock_irqsave(&xhci->lock, flags);

	virt_dev = xhci->devs[udev->slot_id];

	if (command) {



	if (command)

		in_ctx = command->in_ctx;

	else

		in_ctx = virt_dev->in_ctx;



	if ((xhci->quirks & XHCI_EP_LIMIT_QUIRK) &&

			xhci_reserve_host_resources(xhci, in_ctx)) {

		spin_unlock_irqrestore(&xhci->lock, flags);
@@ -1776,6 +1780,7 @@ static int xhci_configure_endpoint(struct xhci_hcd *xhci, 
		return -ENOMEM;

	}



	if (command) {

		cmd_completion = command->completion;

		cmd_status = &command->status;

		command->command_trb = xhci->cmd_ring->enqueue;
@@ -1789,15 +1794,6 @@ static int xhci_configure_endpoint(struct xhci_hcd *xhci, 


		list_add_tail(&command->cmd_list, &virt_dev->cmd_list);

	} else {

		in_ctx = virt_dev->in_ctx;

		if ((xhci->quirks & XHCI_EP_LIMIT_QUIRK) &&

				xhci_reserve_host_resources(xhci, in_ctx)) {

			spin_unlock_irqrestore(&xhci->lock, flags);

			xhci_warn(xhci, "Not enough host resources, "

					"active endpoint contexts = %u\n",

					xhci->num_active_eps);

			return -ENOMEM;

		}

		cmd_completion = &virt_dev->cmd_completion;

		cmd_status = &virt_dev->cmd_status;

	}