Skip to content

Commit

Permalink
xHCI: Remove redundant variable in xhci_resume()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andiry Xu authored and Sarah Sharp committed Mar 14, 2011
1 parent 518e848 commit 019a35f
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions drivers/usb/host/xhci.c
Original file line number Diff line number Diff line change
Expand Up @@ -696,9 +696,8 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
{
u32 command, temp = 0;
struct usb_hcd *hcd = xhci_to_hcd(xhci);
int old_state, retval;
int retval;

old_state = hcd->state;
if (time_before(jiffies, xhci->next_statechange))
msleep(100);

Expand Down Expand Up @@ -782,10 +781,6 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
*/

set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
if (!hibernated)
hcd->state = old_state;
else
hcd->state = HC_STATE_SUSPENDED;

spin_unlock_irq(&xhci->lock);
return 0;
Expand Down

0 comments on commit 019a35f

Please sign in to comment.