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-mxc.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-mxc.c')
-rw-r--r-- | drivers/usb/host/ehci-mxc.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c index 4a08fc0b27c9..a37224a4a49b 100644 --- a/drivers/usb/host/ehci-mxc.c +++ b/drivers/usb/host/ehci-mxc.c | |||
@@ -40,16 +40,10 @@ struct ehci_mxc_priv { | |||
40 | static int ehci_mxc_setup(struct usb_hcd *hcd) | 40 | static int ehci_mxc_setup(struct usb_hcd *hcd) |
41 | { | 41 | { |
42 | struct ehci_hcd *ehci = hcd_to_ehci(hcd); | 42 | struct ehci_hcd *ehci = hcd_to_ehci(hcd); |
43 | int retval; | ||
44 | 43 | ||
45 | hcd->has_tt = 1; | 44 | hcd->has_tt = 1; |
46 | 45 | ||
47 | retval = ehci_setup(hcd); | 46 | return ehci_setup(hcd); |
48 | if (retval) | ||
49 | return retval; | ||
50 | |||
51 | ehci_port_power(ehci, 0); | ||
52 | return 0; | ||
53 | } | 47 | } |
54 | 48 | ||
55 | static const struct hc_driver ehci_mxc_hc_driver = { | 49 | static const struct hc_driver ehci_mxc_hc_driver = { |