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 /arch | |
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 'arch')
-rw-r--r-- | arch/arm/mach-cns3xxx/cns3420vb.c | 1 | ||||
-rw-r--r-- | arch/mips/ath79/dev-usb.c | 2 | ||||
-rw-r--r-- | arch/mips/loongson1/common/platform.c | 1 |
3 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-cns3xxx/cns3420vb.c b/arch/arm/mach-cns3xxx/cns3420vb.c index 8a00cee82228..ae305397003c 100644 --- a/arch/arm/mach-cns3xxx/cns3420vb.c +++ b/arch/arm/mach-cns3xxx/cns3420vb.c | |||
@@ -162,7 +162,6 @@ static void csn3xxx_usb_power_off(struct platform_device *pdev) | |||
162 | } | 162 | } |
163 | 163 | ||
164 | static struct usb_ehci_pdata cns3xxx_usb_ehci_pdata = { | 164 | static struct usb_ehci_pdata cns3xxx_usb_ehci_pdata = { |
165 | .port_power_off = 1, | ||
166 | .power_on = csn3xxx_usb_power_on, | 165 | .power_on = csn3xxx_usb_power_on, |
167 | .power_off = csn3xxx_usb_power_off, | 166 | .power_off = csn3xxx_usb_power_off, |
168 | }; | 167 | }; |
diff --git a/arch/mips/ath79/dev-usb.c b/arch/mips/ath79/dev-usb.c index 072bb9be2304..bd2bc108e1b5 100644 --- a/arch/mips/ath79/dev-usb.c +++ b/arch/mips/ath79/dev-usb.c | |||
@@ -50,13 +50,11 @@ static u64 ath79_ehci_dmamask = DMA_BIT_MASK(32); | |||
50 | 50 | ||
51 | static struct usb_ehci_pdata ath79_ehci_pdata_v1 = { | 51 | static struct usb_ehci_pdata ath79_ehci_pdata_v1 = { |
52 | .has_synopsys_hc_bug = 1, | 52 | .has_synopsys_hc_bug = 1, |
53 | .port_power_off = 1, | ||
54 | }; | 53 | }; |
55 | 54 | ||
56 | static struct usb_ehci_pdata ath79_ehci_pdata_v2 = { | 55 | static struct usb_ehci_pdata ath79_ehci_pdata_v2 = { |
57 | .caps_offset = 0x100, | 56 | .caps_offset = 0x100, |
58 | .has_tt = 1, | 57 | .has_tt = 1, |
59 | .port_power_off = 1, | ||
60 | }; | 58 | }; |
61 | 59 | ||
62 | static struct platform_device ath79_ehci_device = { | 60 | static struct platform_device ath79_ehci_device = { |
diff --git a/arch/mips/loongson1/common/platform.c b/arch/mips/loongson1/common/platform.c index 2874bf224418..0412ad61e290 100644 --- a/arch/mips/loongson1/common/platform.c +++ b/arch/mips/loongson1/common/platform.c | |||
@@ -109,7 +109,6 @@ static struct resource ls1x_ehci_resources[] = { | |||
109 | }; | 109 | }; |
110 | 110 | ||
111 | static struct usb_ehci_pdata ls1x_ehci_pdata = { | 111 | static struct usb_ehci_pdata ls1x_ehci_pdata = { |
112 | .port_power_off = 1, | ||
113 | }; | 112 | }; |
114 | 113 | ||
115 | struct platform_device ls1x_ehci_device = { | 114 | struct platform_device ls1x_ehci_device = { |