diff options
author | Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2011-03-11 16:49:55 -0500 |
---|---|---|
committer | Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2011-03-13 21:07:10 -0400 |
commit | ad73dff32e04cad1ff2af89512bf489224b503cc (patch) | |
tree | 0c8728f65b5ccc7c1f9752af4347211933c65662 /drivers | |
parent | 4814030ce11f08350b7a91573487ad4b600dae34 (diff) |
xhci: Remove references to HC_STATE_RUNNING.
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/usb/host/xhci-hub.c | 1 | ||||
-rw-r--r-- | drivers/usb/host/xhci.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c index 004a46557f9c..43e0a099d634 100644 --- a/drivers/usb/host/xhci-hub.c +++ b/drivers/usb/host/xhci-hub.c | |||
@@ -732,7 +732,6 @@ int xhci_bus_resume(struct usb_hcd *hcd) | |||
732 | (void) xhci_readl(xhci, &xhci->op_regs->command); | 732 | (void) xhci_readl(xhci, &xhci->op_regs->command); |
733 | 733 | ||
734 | xhci->next_statechange = jiffies + msecs_to_jiffies(5); | 734 | xhci->next_statechange = jiffies + msecs_to_jiffies(5); |
735 | hcd->state = HC_STATE_RUNNING; | ||
736 | /* re-enable irqs */ | 735 | /* re-enable irqs */ |
737 | temp = xhci_readl(xhci, &xhci->op_regs->command); | 736 | temp = xhci_readl(xhci, &xhci->op_regs->command); |
738 | temp |= CMD_EIE; | 737 | temp |= CMD_EIE; |
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 63b8db5275e9..883b4c402c6a 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c | |||
@@ -452,7 +452,6 @@ int xhci_run(struct usb_hcd *hcd) | |||
452 | xhci_writel(xhci, temp, &xhci->ir_set->irq_control); | 452 | xhci_writel(xhci, temp, &xhci->ir_set->irq_control); |
453 | 453 | ||
454 | /* Set the HCD state before we enable the irqs */ | 454 | /* Set the HCD state before we enable the irqs */ |
455 | hcd->state = HC_STATE_RUNNING; | ||
456 | temp = xhci_readl(xhci, &xhci->op_regs->command); | 455 | temp = xhci_readl(xhci, &xhci->op_regs->command); |
457 | temp |= (CMD_EIE); | 456 | temp |= (CMD_EIE); |
458 | xhci_dbg(xhci, "// Enable interrupts, cmd = 0x%x.\n", | 457 | xhci_dbg(xhci, "// Enable interrupts, cmd = 0x%x.\n", |