summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKunwu Chan <chentao@kylinos.cn>2024-08-23 15:42:01 +0800
committerBjorn Helgaas <bhelgaas@google.com>2024-08-23 12:46:22 -0500
commit8a48281cfa7f380707d42b649acda3ea36348697 (patch)
treeef43805fb22d10b36edf30f0f12e744c96382dd0
parentdbc3171194403d0d40e4bdeae666f6e76e428b53 (diff)
downloadlinux-8a48281cfa7f380707d42b649acda3ea36348697.tar.gz
linux-8a48281cfa7f380707d42b649acda3ea36348697.tar.bz2
linux-8a48281cfa7f380707d42b649acda3ea36348697.zip
PCI: Make pci_bus_type constant
Since commit d492cc2573a0 ("driver core: device.h: make struct bus_type a const *"), the driver core can properly handle constant struct bus_type, move the pci_bus_type variable to be a constant structure as well, placing it into read-only memory which can not be modified at runtime. Link: https://lore.kernel.org/r/20240823074202.139265-1-kunwu.chan@linux.dev Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Kunwu Chan <chentao@kylinos.cn> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/pci/pci-driver.c2
-rw-r--r--include/linux/pci.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index f412ef73a6e4..35270172c833 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -1670,7 +1670,7 @@ static void pci_dma_cleanup(struct device *dev)
iommu_device_unuse_default_domain(dev);
}
-struct bus_type pci_bus_type = {
+const struct bus_type pci_bus_type = {
.name = "pci",
.match = pci_bus_match,
.uevent = pci_uevent,
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 4cf89a4b4cbc..197292b336a5 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1098,7 +1098,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. */