Changeset 41702


Ignore:
Timestamp:
2014-07-17T18:44:04+02:00 (4 years ago)
Author:
nbd
Message:

kernel/3.1{3, 4}: fix AMD USB HDC wakeup quirk disabling

Declare inline placeholder when usb_hcd_amd_remote_wakeup_quirk() not
compiled due CONFIG_PCI_DISABLE_COMMON_QUIRKS.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@…>

Location:
trunk/target/linux/generic
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/generic/patches-3.13/811-pci_disable_usb_common_quirks.patch

    r39534 r41702  
    8383  
    8484 #endif  /*  __LINUX_USB_PCI_QUIRKS_H  */ 
     85--- a/include/linux/usb/hcd.h 
     86+++ b/include/linux/usb/hcd.h 
     87@@ -436,7 +436,14 @@ extern int usb_hcd_pci_probe(struct pci_ 
     88 extern void usb_hcd_pci_remove(struct pci_dev *dev); 
     89 extern void usb_hcd_pci_shutdown(struct pci_dev *dev); 
     90  
     91+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS 
     92 extern int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *dev); 
     93+#else 
     94+static inline int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *dev) 
     95+{ 
     96+       return 0; 
     97+} 
     98+#endif 
     99  
     100 #ifdef CONFIG_PM 
     101 extern const struct dev_pm_ops usb_hcd_pci_pm_ops; 
  • trunk/target/linux/generic/patches-3.14/811-pci_disable_usb_common_quirks.patch

    r41533 r41702  
    8383  
    8484 #endif  /*  __LINUX_USB_PCI_QUIRKS_H  */ 
     85--- a/include/linux/usb/hcd.h 
     86+++ b/include/linux/usb/hcd.h 
     87@@ -439,7 +439,14 @@ extern int usb_hcd_pci_probe(struct pci_ 
     88 extern void usb_hcd_pci_remove(struct pci_dev *dev); 
     89 extern void usb_hcd_pci_shutdown(struct pci_dev *dev); 
     90  
     91+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS 
     92 extern int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *dev); 
     93+#else 
     94+static inline int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *dev) 
     95+{ 
     96+       return 0; 
     97+} 
     98+#endif 
     99  
     100 #ifdef CONFIG_PM 
     101 extern const struct dev_pm_ops usb_hcd_pci_pm_ops; 
Note: See TracChangeset for help on using the changeset viewer.