Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d670a2e authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

USB: UHCI: remove uses of hcd->state 



This patch (as1456) removes all uses of hcd->state from the uhci-hcd
driver, as part of the overall strategy to eliminate hcd->state
completely.  Now when a controller dies we call usb_hc_died()
directly, instead of relying on the core interrupt handler to see that
hcd->state has changed to HC_STATE_HALT and make the call for us.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 4661ffc9

drivers/usb/host/uhci-hcd.c

+1 −6
Original line number Diff line number Diff line
@@ -139,7 +139,6 @@ static void finish_reset(struct uhci_hcd *uhci) 
	uhci->port_c_suspend = uhci->resuming_ports = 0;

	uhci->rh_state = UHCI_RH_RESET;

	uhci->is_stopped = UHCI_IS_STOPPED;

	uhci_to_hcd(uhci)->state = HC_STATE_HALT;

	clear_bit(HCD_FLAG_POLL_RH, &uhci_to_hcd(uhci)->flags);



	uhci->dead = 0;		/* Full reset resurrects the controller */
@@ -188,10 +187,6 @@ static void configure_hc(struct uhci_hcd *uhci) 
	outw(uhci->frame_number & UHCI_MAX_SOF_NUMBER,

			uhci->io_addr + USBFRNUM);



	/* Mark controller as not halted before we enable interrupts */

	uhci_to_hcd(uhci)->state = HC_STATE_SUSPENDED;

	mb();



	/* Enable PIRQ */

	pci_write_config_word(pdev, USBLEGSUP, USBLEGSUP_DEFAULT);
@@ -360,7 +355,6 @@ __acquires(uhci->lock) 


static void start_rh(struct uhci_hcd *uhci)

{

	uhci_to_hcd(uhci)->state = HC_STATE_RUNNING;

	uhci->is_stopped = 0;



	/* Mark it configured and running with a 64-byte max packet.
@@ -449,6 +443,7 @@ static irqreturn_t uhci_irq(struct usb_hcd *hcd) 
					lprintk(errbuf);

				}

				uhci_hc_died(uhci);

				usb_hc_died(hcd);



				/* Force a callback in case there are

				 * pending unlinks */