diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2024-09-19 14:25:34 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2024-09-19 14:25:34 -0500 |
commit | 5dc07a20ac1c6882e191f821f9c75edde958224d (patch) | |
tree | e8621cd15f2332ac2836981106f12fa877cb0ac1 /include/linux/pci.h | |
parent | ca5c65687e3e0370623e9e5d4e1a2aab8ebe20fd (diff) | |
parent | 5c7bdac783be8dcba1427460e7971445f839a5e2 (diff) | |
download | lwn-5dc07a20ac1c6882e191f821f9c75edde958224d.tar.gz lwn-5dc07a20ac1c6882e191f821f9c75edde958224d.zip |
Merge branch 'pci/misc'
- Check pcie_find_root_port() return in x86 fixups to avoid NULL pointer
dereferences (Samasth Norway Ananda)
- Make pci_bus_type constant (Kunwu Chan)
- Remove unused declarations of __pci_pme_wakeup() and pci_vpd_release()
(Yue Haibing)
- Remove any leftover .*.cmd files with make clean (zhang jiao)
* pci/misc:
PCI: Fix typos
PCI/VPD: Remove pci_vpd_release() unused declarations
PCI/PM: Remove __pci_pme_wakeup() unused declarations
PCI: Make pci_bus_type constant
x86/PCI: Check pcie_find_root_port() return for NULL
Diffstat (limited to 'include/linux/pci.h')
-rw-r--r-- | include/linux/pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 4fe05ebb1da2..573b4c4c2be6 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1102,7 +1102,7 @@ enum pcie_bus_config_types { extern enum pcie_bus_config_types pcie_bus_config; -extern struct bus_type pci_bus_type; +extern const struct bus_type pci_bus_type; /* Do NOT directly access these two variables, unless you are arch-specific PCI * code, or PCI core code. */ |