diff options
author | Alan Stern <stern@rowland.harvard.edu> | 2012-10-31 13:12:11 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-31 15:48:07 -0400 |
commit | 4968f951913997adc8c68c4e986e8168ee1d2998 (patch) | |
tree | 4ab4aa7bff6faf8c533ec5c346d591fdb0ed64b5 /drivers/usb/host/ehci-pci.c | |
parent | 571e41214e988bc38c99d804e6d8e1ea1d016342 (diff) |
USB: EHCI: remove unused Link Power Management code
This patch (as1622) removes the USB-2.1 Link Power Management code
from the ehci-hcd driver. This code was never integrated with
usbcore, it is full of bugs, and it was not getting used by anybody.
However, the debugging code for dumping the LPM-related fields in the
EHCI registers is left in place. In theory it might be useful to see
these values, even though we don't use them.
This essentially amounts to a partial revert of commit
aa4d8342988d0c1a79ff19b2ede1e81dfbb16ea5 (USB: EHCI: EHCI 1.1
addendum: preparation) and an almost full revert of commit
48f24970144479c29b8cee6d2e1dbedf6dcf9cfb (USB: EHCI: EHCI 1.1
addendum: Basic LPM feature support) plus its follow-ons.
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-pci.c')
-rw-r--r-- | drivers/usb/host/ehci-pci.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index 7880ba621f89..e17330ae0aee 100644 --- a/drivers/usb/host/ehci-pci.c +++ b/drivers/usb/host/ehci-pci.c | |||
@@ -202,11 +202,6 @@ static int ehci_pci_setup(struct usb_hcd *hcd) | |||
202 | break; | 202 | break; |
203 | case PCI_VENDOR_ID_INTEL: | 203 | case PCI_VENDOR_ID_INTEL: |
204 | ehci->need_io_watchdog = 0; | 204 | ehci->need_io_watchdog = 0; |
205 | if (pdev->device == 0x0806 || pdev->device == 0x0811 | ||
206 | || pdev->device == 0x0829) { | ||
207 | ehci_info(ehci, "disable lpm for langwell/penwell\n"); | ||
208 | ehci->has_lpm = 0; | ||
209 | } | ||
210 | break; | 205 | break; |
211 | case PCI_VENDOR_ID_NVIDIA: | 206 | case PCI_VENDOR_ID_NVIDIA: |
212 | switch (pdev->device) { | 207 | switch (pdev->device) { |
@@ -216,8 +211,7 @@ static int ehci_pci_setup(struct usb_hcd *hcd) | |||
216 | * devices with PPCD enabled. | 211 | * devices with PPCD enabled. |
217 | */ | 212 | */ |
218 | case 0x0d9d: | 213 | case 0x0d9d: |
219 | ehci_info(ehci, "disable lpm/ppcd for nvidia mcp89"); | 214 | ehci_info(ehci, "disable ppcd for nvidia mcp89\n"); |
220 | ehci->has_lpm = 0; | ||
221 | ehci->has_ppcd = 0; | 215 | ehci->has_ppcd = 0; |
222 | ehci->command &= ~CMD_PPCEE; | 216 | ehci->command &= ~CMD_PPCEE; |
223 | break; | 217 | break; |
@@ -425,11 +419,6 @@ static const struct hc_driver ehci_pci_hc_driver = { | |||
425 | .relinquish_port = ehci_relinquish_port, | 419 | .relinquish_port = ehci_relinquish_port, |
426 | .port_handed_over = ehci_port_handed_over, | 420 | .port_handed_over = ehci_port_handed_over, |
427 | 421 | ||
428 | /* | ||
429 | * call back when device connected and addressed | ||
430 | */ | ||
431 | .update_device = ehci_update_device, | ||
432 | |||
433 | .clear_tt_buffer_complete = ehci_clear_tt_buffer_complete, | 422 | .clear_tt_buffer_complete = ehci_clear_tt_buffer_complete, |
434 | }; | 423 | }; |
435 | 424 | ||