qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 00:30:16 +02:00
Code

generic: update pci_disable_usb_common_quirks patch

Browse Source 
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@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34675 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
juhosg 2012-12-14 08:32:56 +00:00
parent 99cb0c3b29
commit a9b0d992c3
2 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
target/linux/generic/patches-3.6/811-pci_disable_usb_common_quirks.patch
View File

@ -21,7 +21,7 @@
/* /*
* Make sure the controller is completely inactive, unable to * Make sure the controller is completely inactive, unable to
* generate interrupts or do DMA. * generate interrupts or do DMA.
@@ -432,6 +438,13 @@ reset_needed: @@ -432,8 +438,16 @@ reset_needed:
uhci_reset_hc(pdev, base); uhci_reset_hc(pdev, base);
return 1; return 1;
} }
@ -34,17 +34,11 @@
+#endif +#endif
EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc); EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc);
static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
@@ -461,6 +474,8 @@ static void __devinit quirk_usb_handoff_
uhci_check_and_reset_hc(pdev, base);
}
+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS +#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
+ static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
static int __devinit mmio_resource_enabled(struct pci_dev *pdev, int idx)
{ {
return pci_resource_start(pdev, idx) && mmio_enabled(pdev); u16 cmd;
@@ -971,3 +986,4 @@ static void __devinit quirk_usb_early_ha @@ -971,3 +985,4 @@ static void __devinit quirk_usb_early_ha
} }
DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID, DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff); PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff);

11
target/linux/generic/patches-3.7/811-pci_disable_usb_common_quirks.patch
View File

@ -21,7 +21,7 @@
/* /*
* Make sure the controller is completely inactive, unable to * Make sure the controller is completely inactive, unable to
* generate interrupts or do DMA. * generate interrupts or do DMA.
@@ -432,6 +438,13 @@ reset_needed: @@ -432,8 +438,17 @@ reset_needed:
uhci_reset_hc(pdev, base); uhci_reset_hc(pdev, base);
return 1; return 1;
} }
@ -34,16 +34,11 @@
+#endif +#endif
EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc); EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc);
static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
@@ -461,6 +474,8 @@ static void __devinit quirk_usb_handoff_
uhci_check_and_reset_hc(pdev, base);
}
+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS +#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
+ +
static int __devinit mmio_resource_enabled(struct pci_dev *pdev, int idx) static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
{ {
return pci_resource_start(pdev, idx) && mmio_enabled(pdev); u16 cmd;
@@ -971,3 +986,4 @@ static void __devinit quirk_usb_early_ha @@ -971,3 +986,4 @@ static void __devinit quirk_usb_early_ha
} }
DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID, DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,