Linux 4.13-rc2

[karo-tx-linux.git] / drivers / pci / host / pcie-xilinx.c

diff --git a/drivers/pci/host/pcie-xilinx.c b/drivers/pci/host/pcie-xilinx.c
index 2fe2df51f9f8334774bc0affc7fed90fc03cfd29..f63fa5e0278c94e1fd5e682bdada9743fe6c9d8b 100644 (file)
--- a/drivers/pci/host/pcie-xilinx.c
+++ b/drivers/pci/host/pcie-xilinx.c
@@ -633,6 +633,7 @@ static int xilinx_pcie_probe(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        struct xilinx_pcie_port *port;
        struct pci_bus *bus, *child;
+       struct pci_host_bridge *bridge;
        int err;
        resource_size_t iobase = 0;
        LIST_HEAD(res);
@@ -640,9 +641,11 @@ static int xilinx_pcie_probe(struct platform_device *pdev)
        if (!dev->of_node)
                return -ENODEV;
 
-       port = devm_kzalloc(dev, sizeof(*port), GFP_KERNEL);
-       if (!port)
-               return -ENOMEM;
+       bridge = devm_pci_alloc_host_bridge(dev, sizeof(*port));
+       if (!bridge)
+               return -ENODEV;
+
+       port = pci_host_bridge_priv(bridge);
 
        port->dev = dev;
 
@@ -671,21 +674,26 @@ static int xilinx_pcie_probe(struct platform_device *pdev)
        if (err)
                goto error;
 
-       bus = pci_create_root_bus(dev, 0, &xilinx_pcie_ops, port, &res);
-       if (!bus) {
-               err = -ENOMEM;
-               goto error;
-       }
+
+       list_splice_init(&res, &bridge->windows);
+       bridge->dev.parent = dev;
+       bridge->sysdata = port;
+       bridge->busnr = 0;
+       bridge->ops = &xilinx_pcie_ops;
+       bridge->map_irq = of_irq_parse_and_map_pci;
+       bridge->swizzle_irq = pci_common_swizzle;
 
 #ifdef CONFIG_PCI_MSI
        xilinx_pcie_msi_chip.dev = dev;
-       bus->msi = &xilinx_pcie_msi_chip;
+       bridge->msi = &xilinx_pcie_msi_chip;
 #endif
-       pci_scan_child_bus(bus);
+       err = pci_scan_root_bus_bridge(bridge);
+       if (err < 0)
+               goto error;
+
+       bus = bridge->bus;
+
        pci_assign_unassigned_bus_resources(bus);
-#ifndef CONFIG_MICROBLAZE
-       pci_fixup_irqs(pci_common_swizzle, of_irq_parse_and_map_pci);
-#endif
        list_for_each_entry(child, &bus->children, node)
                pcie_bus_configure_settings(child);
        pci_bus_add_devices(bus);
@@ -696,7 +704,7 @@ error:
        return err;
 }
 
-static struct of_device_id xilinx_pcie_of_match[] = {
+static const struct of_device_id xilinx_pcie_of_match[] = {
        { .compatible = "xlnx,axi-pcie-host-1.00.a", },
        {}
 };