[openwrt/openwrt] kernel: fix disabling common usb quirks on 4.14

[LEDE Commits]

nbd pushed a commit to openwrt/openwrt.git, branch master:
https://git.lede-project.org/c38fb585763f8aba0a019a6ee55363843753d275

commit c38fb585763f8aba0a019a6ee55363843753d275
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Tue Feb 20 22:16:27 2018 +0100

    kernel: fix disabling common usb quirks on 4.14
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 .../pending-4.14/811-pci_disable_usb_common_quirks.patch     | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/target/linux/generic/pending-4.14/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/pending-4.14/811-pci_disable_usb_common_quirks.patch
index 005c25d..9bbbaf8 100644
--- a/target/linux/generic/pending-4.14/811-pci_disable_usb_common_quirks.patch
+++ b/target/linux/generic/pending-4.14/811-pci_disable_usb_common_quirks.patch
@@ -48,14 +48,11 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
  static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
  {
  	u16 cmd;
-@@ -1158,6 +1173,7 @@ static void quirk_usb_early_handoff(stru
+@@ -1178,3 +1193,4 @@ bool usb_xhci_needs_pci_reset(struct pci
+ 	return false;
  }
- DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
- 			PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff);
+ EXPORT_SYMBOL_GPL(usb_xhci_needs_pci_reset);
 +#endif
- 
- bool usb_xhci_needs_pci_reset(struct pci_dev *pdev)
- {
 --- a/drivers/usb/host/pci-quirks.h
 +++ b/drivers/usb/host/pci-quirks.h
 @@ -5,6 +5,9 @@
@@ -68,7 +65,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
  int usb_amd_find_chipset_info(void);
  int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *pdev);
  bool usb_amd_hang_symptom_quirk(void);
-@@ -19,12 +22,25 @@ void sb800_prefetch(struct device *dev,
+@@ -19,12 +22,26 @@ void sb800_prefetch(struct device *dev,
  bool usb_xhci_needs_pci_reset(struct pci_dev *pdev);
  #else
  struct pci_dev;
@@ -91,6 +88,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
  static inline void usb_disable_xhci_ports(struct pci_dev *xhci_pdev) {}
  static inline void sb800_prefetch(struct device *dev, int on) {}
 +static inline void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev) {}
++static inline bool usb_xhci_needs_pci_reset(struct pci_dev *pdev) {}
  #endif  /* CONFIG_USB_PCI */
  
  #endif  /*  __LINUX_USB_PCI_QUIRKS_H  */