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

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

USB: EHCI: fix up root-hub TT mess 



This patch (as1095) cleans up the HCD glue and several of the EHCI
bus-glue files.  The ehci->is_tdi_rh_tt flag is redundant, since it
means the same thing as the hcd->has_tt flag, so it is removed and the
other flag used in its place.

Some of the bus-glue files didn't get the relinquish_port method added
to their hc_driver structures.  Although that routine currently
doesn't do anything for controllers with an integrated TT, in the
future it might.  So the patch adds it where it is missing.

Lastly, some of the bus-glue files have erroneous entries for their
hc_driver's suspend and resume methods.  These method pointers are
specific to PCI and shouldn't be used otherwise.

(The patch also includes an invisible whitespace fix.)

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Acked-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
parent 217a9081

drivers/usb/host/ehci-fsl.c

+1 −5
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ static int ehci_fsl_setup(struct usb_hcd *hcd) 
	if (retval)

		return retval;



	ehci->is_tdi_rh_tt = 1;

	hcd->has_tt = 1;



	ehci->sbrn = 0x20;
@@ -295,10 +295,6 @@ static const struct hc_driver ehci_fsl_hc_driver = { 
	 */

	.reset = ehci_fsl_setup,

	.start = ehci_run,

#ifdef	CONFIG_PM

	.suspend = ehci_bus_suspend,

	.resume = ehci_bus_resume,

#endif

	.stop = ehci_stop,

	.shutdown = ehci_shutdown,

drivers/usb/host/ehci-ixp4xx.c

+2 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ static int ixp4xx_ehci_init(struct usb_hcd *hcd) 
		+ HC_LENGTH(ehci_readl(ehci, &ehci->caps->hc_capbase));

	ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);



	ehci->is_tdi_rh_tt = 1;

	hcd->has_tt = 1;

	ehci_reset(ehci);



	retval = ehci_init(hcd);
@@ -58,6 +58,7 @@ static const struct hc_driver ixp4xx_ehci_hc_driver = { 
	.bus_suspend		= ehci_bus_suspend,

	.bus_resume		= ehci_bus_resume,

#endif

	.relinquish_port	= ehci_relinquish_port,

};



static int ixp4xx_ehci_probe(struct platform_device *pdev)

drivers/usb/host/ehci-orion.c

+2 −5
Original line number Diff line number Diff line
@@ -139,10 +139,6 @@ static const struct hc_driver ehci_orion_hc_driver = { 
	 */

	.reset = ehci_orion_setup,

	.start = ehci_run,

#ifdef CONFIG_PM

	.suspend = ehci_bus_suspend,

	.resume = ehci_bus_resume,

#endif

	.stop = ehci_stop,

	.shutdown = ehci_shutdown,
@@ -165,6 +161,7 @@ static const struct hc_driver ehci_orion_hc_driver = { 
	.hub_control = ehci_hub_control,

	.bus_suspend = ehci_bus_suspend,

	.bus_resume = ehci_bus_resume,

	.relinquish_port = ehci_relinquish_port,

};



static void __init
@@ -250,7 +247,7 @@ static int __init ehci_orion_drv_probe(struct platform_device *pdev) 
	ehci->regs = hcd->regs + 0x100 +

		HC_LENGTH(ehci_readl(ehci, &ehci->caps->hc_capbase));

	ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);

	ehci->is_tdi_rh_tt = 1;

	hcd->has_tt = 1;

	ehci->sbrn = 0x20;



	/*

drivers/usb/host/ehci-pci.c

+1 −2
Original line number Diff line number Diff line
@@ -129,7 +129,6 @@ static int ehci_pci_setup(struct usb_hcd *hcd) 
	switch (pdev->vendor) {

	case PCI_VENDOR_ID_TDI:

		if (pdev->device == PCI_DEVICE_ID_TDI_EHCI) {

			ehci->is_tdi_rh_tt = 1;

			hcd->has_tt = 1;

			tdi_reset(ehci);

		}

drivers/usb/host/ehci-ppc-of.c

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ static const struct hc_driver ehci_ppc_of_hc_driver = { 
	.bus_suspend		= ehci_bus_suspend,

	.bus_resume		= ehci_bus_resume,

#endif

	.relinquish_port	= ehci_relinquish_port,

};