Skip to content

Commit 92eb132

Browse files
committed
PCI: dwc: ep: Call epc_create() early in dw_pcie_ep_init()
Move devm_pci_epc_create() to the beginning of dw_pcie_ep_init(). devm_pci_epc_create() is generic code that doesn't depend on any DWC resource, so moving it earlier keeps all the subsequent devicetree-related code together. Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Bjorn Helgaas <[email protected]> Reviewed-by: Frank Li <[email protected]>
1 parent 7db02f7 commit 92eb132

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -904,6 +904,15 @@ int dw_pcie_ep_init(struct dw_pcie_ep *ep)
904904

905905
INIT_LIST_HEAD(&ep->func_list);
906906

907+
epc = devm_pci_epc_create(dev, &epc_ops);
908+
if (IS_ERR(epc)) {
909+
dev_err(dev, "Failed to create epc device\n");
910+
return PTR_ERR(epc);
911+
}
912+
913+
ep->epc = epc;
914+
epc_set_drvdata(epc, ep);
915+
907916
ret = dw_pcie_get_resources(pci);
908917
if (ret)
909918
return ret;
@@ -918,15 +927,6 @@ int dw_pcie_ep_init(struct dw_pcie_ep *ep)
918927
if (ep->ops->pre_init)
919928
ep->ops->pre_init(ep);
920929

921-
epc = devm_pci_epc_create(dev, &epc_ops);
922-
if (IS_ERR(epc)) {
923-
dev_err(dev, "Failed to create epc device\n");
924-
return PTR_ERR(epc);
925-
}
926-
927-
ep->epc = epc;
928-
epc_set_drvdata(epc, ep);
929-
930930
ret = of_property_read_u8(np, "max-functions", &epc->max_functions);
931931
if (ret < 0)
932932
epc->max_functions = 1;

0 commit comments

Comments
 (0)