1 files changed, 15 insertions, 6 deletions

diff --git a/drivers/pci/host/pci-xgene.c b/drivers/pci/host/pci-xgene.c
index 8cae013e7188..262bedf026c1 100644
--- a/drivers/pci/host/pci-xgene.c
+++ b/drivers/pci/host/pci-xgene.c
@@ -636,13 +636,16 @@ static int xgene_pcie_probe_bridge(struct platform_device *pdev)
         struct xgene_pcie_port *port;
         resource_size_t iobase = 0;
         struct pci_bus *bus, *child;
+        struct pci_host_bridge *bridge;
         int ret;
         LIST_HEAD(res);
 
-        port = devm_kzalloc(dev, sizeof(*port), GFP_KERNEL);
-        if (!port)
+        bridge = devm_pci_alloc_host_bridge(dev, sizeof(*port));
+        if (!bridge)
                 return -ENOMEM;
 
+        port = pci_host_bridge_priv(bridge);
+
         port->node = of_node_get(dn);
         port->dev = dev;
 
@@ -670,11 +673,17 @@ static int xgene_pcie_probe_bridge(struct platform_device *pdev)
         if (ret)
                 goto error;
 
-        bus = pci_create_root_bus(dev, 0, &xgene_pcie_ops, port, &res);
-        if (!bus) {
-                ret = -ENOMEM;
+        list_splice_init(&res, &bridge->windows);
+        bridge->dev.parent = dev;
+        bridge->sysdata = port;
+        bridge->busnr = 0;
+        bridge->ops = &xgene_pcie_ops;
+
+        ret = pci_scan_root_bus_bridge(bridge);
+        if (ret < 0)
                 goto error;
-        }
+
+        bus = bridge->bus;
 
         pci_scan_child_bus(bus);
         pci_assign_unassigned_bus_resources(bus);