diff options
author | Alan Stern <stern@rowland.harvard.edu> | 2012-10-31 13:21:06 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-31 15:48:07 -0400 |
commit | c73cee717e7d5da0698acb720ad1219646fe4f46 (patch) | |
tree | 7905e61101886695d291e39c7c2ee4042e2e6f70 /drivers/usb/host/ehci-spear.c | |
parent | 4968f951913997adc8c68c4e986e8168ee1d2998 (diff) |
USB: EHCI: remove ehci_port_power() routine
This patch (as1623) removes the ehci_port_power() routine and all the
places that call it. There's no reason for ehci-hcd to change the
port power settings; the hub driver takes care of all that stuff.
There is one exception: When the controller is resumed from
hibernation or following a loss of power, the ports that are supposed
to be handed over to a companion controller must be powered on first.
Otherwise the handover won't work. This process is not visible to the
hub driver, so it has to be handled in ehci-hcd.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/ehci-spear.c')
-rw-r--r-- | drivers/usb/host/ehci-spear.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/usb/host/ehci-spear.c b/drivers/usb/host/ehci-spear.c index c718a065e154..719ca48a471a 100644 --- a/drivers/usb/host/ehci-spear.c +++ b/drivers/usb/host/ehci-spear.c | |||
@@ -37,18 +37,11 @@ static void spear_stop_ehci(struct spear_ehci *ehci) | |||
37 | static int ehci_spear_setup(struct usb_hcd *hcd) | 37 | static int ehci_spear_setup(struct usb_hcd *hcd) |
38 | { | 38 | { |
39 | struct ehci_hcd *ehci = hcd_to_ehci(hcd); | 39 | struct ehci_hcd *ehci = hcd_to_ehci(hcd); |
40 | int retval = 0; | ||
41 | 40 | ||
42 | /* registers start at offset 0x0 */ | 41 | /* registers start at offset 0x0 */ |
43 | ehci->caps = hcd->regs; | 42 | ehci->caps = hcd->regs; |
44 | 43 | ||
45 | retval = ehci_setup(hcd); | 44 | return ehci_setup(hcd); |
46 | if (retval) | ||
47 | return retval; | ||
48 | |||
49 | ehci_port_power(ehci, 0); | ||
50 | |||
51 | return retval; | ||
52 | } | 45 | } |
53 | 46 | ||
54 | static const struct hc_driver ehci_spear_hc_driver = { | 47 | static const struct hc_driver ehci_spear_hc_driver = { |