xhci: Remove references to HC_STATE_RUNNING. (ad73dff3) · Commits · 戴 / test

The USB core will set hcd->state to HC_STATE_RUNNING before calling xhci_run, so there's no point in setting it twice. The USB core also doesn't pay attention to HC_STATE_RUNNING on the resume path anymore; it uses HCD_RH_RUNNING(), which looks at hcd->flags & (1U << HCD_FLAG_RH_RUNNING. Therefore, it's safe to remove the state set in xhci_bus_resume(). Signed-off-by:

Sarah Sharp <sarah.a.sharp@linux.intel.com>

drivers/usb/host/xhci-hub.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -732,7 +732,6 @@ int xhci_bus_resume(struct usb_hcd *hcd)
		(void) xhci_readl(xhci, &xhci->op_regs->command);

		xhci->next_statechange = jiffies + msecs_to_jiffies(5);
		hcd->state = HC_STATE_RUNNING;
		/* re-enable irqs */
		temp = xhci_readl(xhci, &xhci->op_regs->command);
		temp \|= CMD_EIE;

drivers/usb/host/xhci.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -452,7 +452,6 @@ int xhci_run(struct usb_hcd *hcd)
		xhci_writel(xhci, temp, &xhci->ir_set->irq_control);

		/* Set the HCD state before we enable the irqs */
		hcd->state = HC_STATE_RUNNING;
		temp = xhci_readl(xhci, &xhci->op_regs->command);
		temp \|= (CMD_EIE);
		xhci_dbg(xhci, "// Enable interrupts, cmd = 0x%x.\n",

Admin message