aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/xhci.c
diff options
context:
space:
mode:
authorAndiry Xu <andiry.xu@amd.com>2011-01-06 02:43:17 -0500
committerSarah Sharp <sarah.a.sharp@linux.intel.com>2011-03-13 21:07:09 -0400
commit019a35f1142b1cd153c8a38338515e633ec0cf77 (patch)
treea61347c56b71a62d9774d3012f7dd449b174674f /drivers/usb/host/xhci.c
parent518e848ea8e2932ce18ce2daef8ad5f55a145f27 (diff)
xHCI: Remove redundant variable in xhci_resume()
Set hcd->state = HC_STATE_SUSPENDED if there is a power loss during system resume or the system is hibernated, otherwise leave it be. The variable old_state is redundant and made an unreachable code path, so remove it. Signed-off-by: Andiry Xu <andiry.xu@amd.com> Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Diffstat (limited to 'drivers/usb/host/xhci.c')
-rw-r--r--drivers/usb/host/xhci.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 64f82b999221..023175eab07d 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -696,9 +696,8 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
696{ 696{
697 u32 command, temp = 0; 697 u32 command, temp = 0;
698 struct usb_hcd *hcd = xhci_to_hcd(xhci); 698 struct usb_hcd *hcd = xhci_to_hcd(xhci);
699 int old_state, retval; 699 int retval;
700 700
701 old_state = hcd->state;
702 if (time_before(jiffies, xhci->next_statechange)) 701 if (time_before(jiffies, xhci->next_statechange))
703 msleep(100); 702 msleep(100);
704 703
@@ -782,10 +781,6 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
782 */ 781 */
783 782
784 set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags); 783 set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
785 if (!hibernated)
786 hcd->state = old_state;
787 else
788 hcd->state = HC_STATE_SUSPENDED;
789 784
790 spin_unlock_irq(&xhci->lock); 785 spin_unlock_irq(&xhci->lock);
791 return 0; 786 return 0;