diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2024-01-15 21:10:34 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2024-01-15 21:10:34 +0300 |
| commit | 78e5ad791faeb97a35c705b3f772dd3bc7dd6b47 (patch) | |
| tree | 87c409b62c88c2a902c14a4ae33d276081def9e6 /include | |
| parent | 996e337f4d33e8775f8f357d4e9234c7efc654d9 (diff) | |
| parent | ac4f1897fa5433a1b07a625503a91b6aa9d7e643 (diff) | |
| download | linux-78e5ad791faeb97a35c705b3f772dd3bc7dd6b47.tar.xz | |
Merge branch 'pci/enumeration'
- Convert pci-host-common.c platform .remove() callback to .remove_new()
returning 'void' since it's not useful to return error codes here (Uwe
Kleine-König)
- Log a message about updating AMD USB controller class code (so dwc3, not
xhci, claims it) only when we actually change it (Guilherme G. Piccoli)
- Use PCI_HEADER_TYPE_* instead of literals in x86, powerpc, SCSI lpfc
(Ilpo Järvinen)
- Clean up open-coded PCIBIOS return code mangling (Ilpo Järvinen)
- Fix 64GT/s effective data rate calculation to use 1b/1b encoding rather
than the 8b/10b or 128b/130b used by lower rates (Ilpo Järvinen)
* pci/enumeration:
PCI: Fix 64GT/s effective data rate calculation
x86/pci: Clean up open-coded PCIBIOS return code mangling
scsi: lpfc: Use PCI_HEADER_TYPE_MFD instead of literal
powerpc/fsl-pci: Use PCI_HEADER_TYPE_MASK instead of literal
x86/pci: Use PCI_HEADER_TYPE_* instead of literals
PCI: Only override AMD USB controller if required
PCI: host-generic: Convert to platform remove callback returning void
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pci-ecam.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pci-ecam.h b/include/linux/pci-ecam.h index 6b1301e2498e..3a4860bd2758 100644 --- a/include/linux/pci-ecam.h +++ b/include/linux/pci-ecam.h @@ -93,6 +93,6 @@ extern const struct pci_ecam_ops loongson_pci_ecam_ops; /* Loongson PCIe */ #if IS_ENABLED(CONFIG_PCI_HOST_COMMON) /* for DT-based PCI controllers that support ECAM */ int pci_host_common_probe(struct platform_device *pdev); -int pci_host_common_remove(struct platform_device *pdev); +void pci_host_common_remove(struct platform_device *pdev); #endif #endif |