Changeset 34675


Ignore:
Timestamp:
2012-12-14T09:32:56+01:00 (5 years ago)
Author:
juhosg
Message:

generic: update pci_disable_usb_common_quirks patch

Fixes the following compiler warning:
drivers/usb/host/pci-quirks.c:459:23: warning: 'quirk_usb_handoff_uhci' defined but not used [-Wunused-function]

Signed-off-by: Gabor Juhos <juhosg@…>

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

Legend:

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

    r34599 r34675  
    2222  * Make sure the controller is completely inactive, unable to 
    2323  * generate interrupts or do DMA. 
    24 @@ -432,6 +438,13 @@ reset_needed: 
     24@@ -432,8 +438,16 @@ reset_needed: 
    2525        uhci_reset_hc(pdev, base); 
    2626        return 1; 
     
    3535 EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc); 
    3636  
     37+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS 
    3738 static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask) 
    38 @@ -461,6 +474,8 @@ static void __devinit quirk_usb_handoff_ 
    39                 uhci_check_and_reset_hc(pdev, base); 
    40  } 
    41   
    42 +#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS 
    43 + 
    44  static int __devinit mmio_resource_enabled(struct pci_dev *pdev, int idx) 
    4539 { 
    46         return pci_resource_start(pdev, idx) && mmio_enabled(pdev); 
    47 @@ -971,3 +986,4 @@ static void __devinit quirk_usb_early_ha 
     40        u16 cmd; 
     41@@ -971,3 +985,4 @@ static void __devinit quirk_usb_early_ha 
    4842 } 
    4943 DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID, 
  • trunk/target/linux/generic/patches-3.7/811-pci_disable_usb_common_quirks.patch

    r34600 r34675  
    2222  * Make sure the controller is completely inactive, unable to 
    2323  * generate interrupts or do DMA. 
    24 @@ -432,6 +438,13 @@ reset_needed: 
     24@@ -432,8 +438,17 @@ reset_needed: 
    2525        uhci_reset_hc(pdev, base); 
    2626        return 1; 
     
    3535 EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc); 
    3636  
    37  static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask) 
    38 @@ -461,6 +474,8 @@ static void __devinit quirk_usb_handoff_ 
    39                 uhci_check_and_reset_hc(pdev, base); 
    40  } 
    41   
    4237+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS 
    4338+ 
    44  static int __devinit mmio_resource_enabled(struct pci_dev *pdev, int idx) 
     39 static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask) 
    4540 { 
    46         return pci_resource_start(pdev, idx) && mmio_enabled(pdev); 
     41        u16 cmd; 
    4742@@ -971,3 +986,4 @@ static void __devinit quirk_usb_early_ha 
    4843 } 
Note: See TracChangeset for help on using the changeset viewer.