diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2024-05-17 02:14:14 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2024-05-17 02:14:14 +0300 |
| commit | 7ecf13fd35feed2e888686320d378769305b8322 (patch) | |
| tree | da434962fa8b5d535c416f09d05dacce555f012f /drivers/pci/pci.h | |
| parent | 375a99fd867cb6b91685708886ccf23e5dee39d4 (diff) | |
| parent | fe4a83ec07818f2243eac584488e65397699550c (diff) | |
| download | linux-7ecf13fd35feed2e888686320d378769305b8322.tar.xz | |
Merge branch 'pci/misc'
- Constify pcibus_class (Heiner Kallweit)
- Annotate pci_cache_line_size variables as __ro_after_init (Heiner
Kallweit)
- Clean up formatting of PCI accessor macros (Ilpo Järvinen)
- Remove some OLPC dead code (Kunwu Chan)
- Make pcie_bandwidth_capable() static (Ilpo Järvinen)
* pci/misc:
PCI: Make pcie_bandwidth_capable() static
x86/pci: Remove OLPC dead code
PCI: Clean up accessor macro formatting
PCI/ERR: Cleanup misleading indentation inside if conditions
PCI: Annotate pci_cache_line_size variables as __ro_after_init
PCI: Constify pcibus_class
Diffstat (limited to 'drivers/pci/pci.h')
| -rw-r--r-- | drivers/pci/pci.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 17fed1846847..fd44565c4756 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -293,8 +293,6 @@ void pci_bus_put(struct pci_bus *bus); const char *pci_speed_string(enum pci_bus_speed speed); enum pci_bus_speed pcie_get_speed_cap(struct pci_dev *dev); enum pcie_link_width pcie_get_width_cap(struct pci_dev *dev); -u32 pcie_bandwidth_capable(struct pci_dev *dev, enum pci_bus_speed *speed, - enum pcie_link_width *width); void __pcie_print_link_status(struct pci_dev *dev, bool verbose); void pcie_report_downtraining(struct pci_dev *dev); void pcie_update_link_speed(struct pci_bus *bus, u16 link_status); |