Commit 94ce1ac2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents dd9c1732 8c493cc9

drivers/pci/probe.c

+7 −0
Original line number Diff line number Diff line
@@ -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,