Merge branch 'pci/misc'

bjorn-helgaas · bjorn-helgaas · commit 45a516f616ca · 2024-03-12T12:14:24.000-05:00
- Make pcie_port_bus_type const (Ricardo B. Marliere)

* pci/misc:
  PCI: Make pcie_port_bus_type const
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
@@ -1709,7 +1709,7 @@ static int pcie_port_bus_match(struct device *dev, struct device_driver *drv)
 	return 1;
 }
 
-struct bus_type pcie_port_bus_type = {
+const struct bus_type pcie_port_bus_type = {
 	.name		= "pci_express",
 	.match		= pcie_port_bus_match,
 };
diff --git a/drivers/pci/pcie/portdrv.h b/drivers/pci/pcie/portdrv.h
@@ -96,7 +96,7 @@ struct pcie_port_service_driver {
 int pcie_port_service_register(struct pcie_port_service_driver *new);
 void pcie_port_service_unregister(struct pcie_port_service_driver *new);
 
-extern struct bus_type pcie_port_bus_type;
+extern const struct bus_type pcie_port_bus_type;
 
 struct pci_dev;
 

Original file line number	Diff line number	Diff line change
`@@ -1709,7 +1709,7 @@ static int pcie_port_bus_match(struct device dev, struct device_driver drv)`
`1709`	`1709`	`return 1;`
`1710`	`1710`	`}`
`1711`	`1711`
`1712`		`-struct bus_type pcie_port_bus_type = {`
	`1712`	`+const struct bus_type pcie_port_bus_type = {`
`1713`	`1713`	`.name = "pci_express",`
`1714`	`1714`	`.match = pcie_port_bus_match,`
`1715`	`1715`	`};`