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/chipidea | |
| 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/chipidea')
| -rw-r--r-- | drivers/usb/chipidea/host.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/drivers/usb/chipidea/host.c b/drivers/usb/chipidea/host.c index ebff9f4f56ec..ebc041ff9cd5 100644 --- a/drivers/usb/chipidea/host.c +++ b/drivers/usb/chipidea/host.c | |||
| @@ -31,22 +31,6 @@ | |||
| 31 | #include "bits.h" | 31 | #include "bits.h" |
| 32 | #include "host.h" | 32 | #include "host.h" |
| 33 | 33 | ||
| 34 | static int ci_ehci_setup(struct usb_hcd *hcd) | ||
| 35 | { | ||
| 36 | struct ehci_hcd *ehci = hcd_to_ehci(hcd); | ||
| 37 | int ret; | ||
| 38 | |||
| 39 | hcd->has_tt = 1; | ||
| 40 | |||
| 41 | ret = ehci_setup(hcd); | ||
| 42 | if (ret) | ||
| 43 | return ret; | ||
| 44 | |||
| 45 | ehci_port_power(ehci, 0); | ||
| 46 | |||
| 47 | return ret; | ||
| 48 | } | ||
| 49 | |||
| 50 | static const struct hc_driver ci_ehci_hc_driver = { | 34 | static const struct hc_driver ci_ehci_hc_driver = { |
| 51 | .description = "ehci_hcd", | 35 | .description = "ehci_hcd", |
| 52 | .product_desc = "ChipIdea HDRC EHCI", | 36 | .product_desc = "ChipIdea HDRC EHCI", |
| @@ -61,7 +45,7 @@ static const struct hc_driver ci_ehci_hc_driver = { | |||
| 61 | /* | 45 | /* |
| 62 | * basic lifecycle operations | 46 | * basic lifecycle operations |
| 63 | */ | 47 | */ |
| 64 | .reset = ci_ehci_setup, | 48 | .reset = ehci_setup, |
| 65 | .start = ehci_run, | 49 | .start = ehci_run, |
| 66 | .stop = ehci_stop, | 50 | .stop = ehci_stop, |
| 67 | .shutdown = ehci_shutdown, | 51 | .shutdown = ehci_shutdown, |
