Revert "USB: EHCI: work around bug in the Philips ISP1562 controller"

This reverts commit 1996e6c572969a8cf6d7fa97eef621219acd94a9.

It turned out to not be needed, now that the real fix has been
committed.

Reported-by: Alan Stern <stern@rowland.harvard.edu>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 5597e609959265130eeb4cdda7fc5e808e1956be..b100f5f9f4b63a3b9ad75f2cb39341109a14cf28 100644 (file)
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -638,7 +638,7 @@ static int ehci_init(struct usb_hcd *hcd)
        INIT_LIST_HEAD(&ehci->cached_itd_list);
        INIT_LIST_HEAD(&ehci->cached_sitd_list);
 
-       if (HCC_PGM_FRAMELISTLEN(hcc_params) && !ehci->sched_size_bug) {
+       if (HCC_PGM_FRAMELISTLEN(hcc_params)) {
                /* periodic schedule size can be smaller than default */
                switch (EHCI_TUNE_FLS) {
                case 0: ehci->periodic_size = 1024; break;

diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index 4baafa3e80b270854bf43bf7f0563025c79bdb12..bc94d7bf072d822fb32da0867b6759dec223f69a 100644 (file)
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -97,13 +97,6 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
                        break;
                }
                break;
-
-       case PCI_VENDOR_ID_PHILIPS:
-               /*
-                * Philips controllers set HCC_PGM_FRAMELISTLEN, but
-                * they don't implement schedule sizes shorter than 1024.
-                */
-               ehci->sched_size_bug = 1;
        }
 
        /* cache this readonly data; minimize chip reads */

diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
index 2a6652fd54001fff43f0f13bac10eaf2d36f4d4d..2694ed6558d2d954c03a4ba3b77eabdc64f9c7f6 100644 (file)
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -149,7 +149,6 @@ struct ehci_hcd {                   /* one per controller */
        unsigned                use_dummy_qh:1; /* AMD Frame List table quirk*/
        unsigned                has_synopsys_hc_bug:1; /* Synopsys HC */
        unsigned                frame_index_bug:1; /* MosChip (AKA NetMos) */
-       unsigned                sched_size_bug:1; /* Philips */
 
        /* required for usb32 quirk */
        #define OHCI_CTRL_HCFS          (3 << 6)