rk: revert to v3.10

[firefly-linux-kernel-4.4.55.git] / drivers / usb / host / ehci-pci.c

diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index fe131565d09006117e40f289658e1e926a7de070..595d210655b67ef79e95fdbd5cc0c347060089c6 100644 (file)
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -35,21 +35,6 @@ static const char hcd_name[] = "ehci-pci";
 #define PCI_DEVICE_ID_INTEL_CE4100_USB 0x2e70
 
 /*-------------------------------------------------------------------------*/
-#define PCI_DEVICE_ID_INTEL_QUARK_X1000_SOC            0x0939
-static inline bool is_intel_quark_x1000(struct pci_dev *pdev)
-{
-       return pdev->vendor == PCI_VENDOR_ID_INTEL &&
-               pdev->device == PCI_DEVICE_ID_INTEL_QUARK_X1000_SOC;
-}
-
-/*
- * 0x84 is the offset of in/out threshold register,
- * and it is the same offset as the register of 'hostpc'.
- */
-#define        intel_quark_x1000_insnreg01     hostpc
-
-/* Maximum usable threshold value is 0x7f dwords for both IN and OUT */
-#define INTEL_QUARK_X1000_EHCI_MAX_THRESHOLD   0x007f007f
 
 /* called after powerup, by probe or system-pm "wakeup" */
 static int ehci_pci_reinit(struct ehci_hcd *ehci, struct pci_dev *pdev)
@@ -65,16 +50,6 @@ static int ehci_pci_reinit(struct ehci_hcd *ehci, struct pci_dev *pdev)
        if (!retval)
                ehci_dbg(ehci, "MWI active\n");
 
-       /* Reset the threshold limit */
-       if (is_intel_quark_x1000(pdev)) {
-               /*
-                * For the Intel QUARK X1000, raise the I/O threshold to the
-                * maximum usable value in order to improve performance.
-                */
-               ehci_writel(ehci, INTEL_QUARK_X1000_EHCI_MAX_THRESHOLD,
-                       ehci->regs->intel_quark_x1000_insnreg01);
-       }
-
        return 0;
 }
 
@@ -428,7 +403,7 @@ static struct pci_driver ehci_pci_driver = {
        .remove =       usb_hcd_pci_remove,
        .shutdown =     usb_hcd_pci_shutdown,
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
        .driver =       {
                .pm =   &usb_hcd_pci_pm_ops
        },