redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

xHCI: Remove redundant variable in xhci_resume()

Browse source 
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>
This commit is contained in:
Andiry Xu 2011-01-06 15:43:17 +08:00 committed by Sarah Sharp
parent 518e848ea8
commit 019a35f114
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/usb/host/xhci.c
View file

@ -696,9 +696,8 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
{ {
u32 command, temp = 0; u32 command, temp = 0;
struct usb_hcd *hcd = xhci_to_hcd(xhci); 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)) if (time_before(jiffies, xhci->next_statechange))
msleep(100); msleep(100);
@ -782,10 +781,6 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
*/ */
set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags); 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); spin_unlock_irq(&xhci->lock);
return 0; return 0;