--- zzzz-none-000/linux-5.4.213/drivers/usb/host/pci-quirks.c 2022-09-15 10:04:56.000000000 +0000 +++ miami-7690-761/linux-5.4.213/drivers/usb/host/pci-quirks.c 2024-05-29 11:20:02.000000000 +0000 @@ -125,6 +125,8 @@ u8 rev; }; +#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS + static struct amd_chipset_info { struct pci_dev *nb_dev; struct pci_dev *smbus_dev; @@ -630,6 +632,10 @@ } EXPORT_SYMBOL_GPL(usb_amd_pt_check_port); +#endif /* CONFIG_PCI_DISABLE_COMMON_QUIRKS */ + +#if IS_ENABLED(CONFIG_USB_UHCI_HCD) + /* * Make sure the controller is completely inactive, unable to * generate interrupts or do DMA. @@ -709,8 +715,17 @@ uhci_reset_hc(pdev, base); return 1; } +#else +int uhci_check_and_reset_hc(struct pci_dev *pdev, unsigned long base) +{ + return 0; +} + +#endif EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc); +#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS + static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask) { u16 cmd; @@ -1271,3 +1286,4 @@ } DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff); +#endif