Commit 84f37c43 authored by Frank Li's avatar Frank Li Committed by Bjorn Helgaas
Browse files

PCI: dwc: Call devm_pci_alloc_host_bridge() early in dw_pcie_host_init() 

Move devm_pci_alloc_host_bridge() to the beginning of dw_pcie_host_init().

devm_pci_alloc_host_bridge() is generic code that doesn't depend on any DWC
resource, so moving it earlier keeps all the subsequent devicetree-related
code together.

[bhelgaas: reorder earlier in series]

Link: https://lore.kernel.org/r/20250315201548.858189-4-helgaas@kernel.org


Signed-off-by: default avatarFrank Li <Frank.Li@nxp.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 513ef9c4

drivers/pci/controller/dwc/pcie-designware-host.c

+6 −6
Original line number Diff line number Diff line
@@ -431,6 +431,12 @@ int dw_pcie_host_init(struct dw_pcie_rp *pp) 


	raw_spin_lock_init(&pp->lock);



	bridge = devm_pci_alloc_host_bridge(dev, 0);

	if (!bridge)

		return -ENOMEM;



	pp->bridge = bridge;



	ret = dw_pcie_get_resources(pci);

	if (ret)

		return ret;
@@ -448,12 +454,6 @@ int dw_pcie_host_init(struct dw_pcie_rp *pp) 
	if (IS_ERR(pp->va_cfg0_base))

		return PTR_ERR(pp->va_cfg0_base);



	bridge = devm_pci_alloc_host_bridge(dev, 0);

	if (!bridge)

		return -ENOMEM;



	pp->bridge = bridge;



	/* Get the I/O range from DT */

	win = resource_list_first_type(&bridge->windows, IORESOURCE_IO);

	if (win) {