Merge tag 'pci-v6.16-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci

torvalds · torvalds · commit 94ce1ac2c9b4 · 2025-07-24T15:33:00.000-07:00
Pull pci fix from Bjorn Helgaas:

 - Create pwrctrl devices only when we need them, i.e., when
   CONFIG_PCI_PWRCTRL is enabled.

   This allows brcmstb to work around a pwrctrl regression by
   disabling CONFIG_PCI_PWRCTRL (Manivannan Sadhasivam)

* tag 'pci-v6.16-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci:
  PCI/pwrctrl: Create pwrctrl devices only when CONFIG_PCI_PWRCTRL is enabled
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
@@ -2508,6 +2508,7 @@ bool pci_bus_read_dev_vendor_id(struct pci_bus *bus, int devfn, u32 *l,
 }
 EXPORT_SYMBOL(pci_bus_read_dev_vendor_id);
 
+#if IS_ENABLED(CONFIG_PCI_PWRCTRL)
 static struct platform_device *pci_pwrctrl_create_device(struct pci_bus *bus, int devfn)
 {
 	struct pci_host_bridge *host = pci_find_host_bridge(bus);
@@ -2537,6 +2538,12 @@ static struct platform_device *pci_pwrctrl_create_device(struct pci_bus *bus, in
 
 	return pdev;
 }
+#else
+static struct platform_device *pci_pwrctrl_create_device(struct pci_bus *bus, int devfn)
+{
+	return NULL;
+}
+#endif
 
 /*
  * Read the config data for a PCI device, sanity-check it,

Original file line number	Diff line number	Diff line change
`@@ -2508,6 +2508,7 @@ bool pci_bus_read_dev_vendor_id(struct pci_bus bus, int devfn, u32 l,`
`2508`	`2508`	`}`
`2509`	`2509`	`EXPORT_SYMBOL(pci_bus_read_dev_vendor_id);`
`2510`	`2510`
	`2511`	`+#if IS_ENABLED(CONFIG_PCI_PWRCTRL)`
`2511`	`2512`	`static struct platform_device pci_pwrctrl_create_device(struct pci_bus bus, int devfn)`
`2512`	`2513`	`{`
`2513`	`2514`	`struct pci_host_bridge *host = pci_find_host_bridge(bus);`
`@@ -2537,6 +2538,12 @@ static struct platform_device pci_pwrctrl_create_device(struct pci_bus bus, in`
`2537`	`2538`
`2538`	`2539`	`return pdev;`
`2539`	`2540`	`}`
	`2541`	`+#else`
	`2542`	`+static struct platform_device pci_pwrctrl_create_device(struct pci_bus bus, int devfn)`
	`2543`	`+{`
	`2544`	`+ return NULL;`
	`2545`	`+}`
	`2546`	`+#endif`
`2540`	`2547`
`2541`	`2548`	`/*`
`2542`	`2549`	`* Read the config data for a PCI device, sanity-check it,`