Commit ae13cb9b authored by Lorenzo Pieralisi's avatar Lorenzo Pieralisi Committed by Bjorn Helgaas

PCI: rockchip: Convert PCI scan API to pci_scan_root_bus_bridge()

The introduction of pci_scan_root_bus_bridge() provides a PCI core API to
scan a PCI root bus backed by an already initialized struct pci_host_bridge
object, which simplifies the bus scan interface and makes the PCI scan root
bus interface easier to generalize as members are added to the struct
pci_host_bridge.

Convert PCI rockchip host code to pci_scan_root_bus_bridge() to improve the
PCI root bus scanning interface.
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Cc: Wenrui Li <wenrui.li@rock-chips.com>
Cc: Shawn Lin <shawn.lin@rock-chips.com>
parent 4246a864
...@@ -1284,6 +1284,7 @@ static int rockchip_pcie_probe(struct platform_device *pdev) ...@@ -1284,6 +1284,7 @@ static int rockchip_pcie_probe(struct platform_device *pdev)
struct rockchip_pcie *rockchip; struct rockchip_pcie *rockchip;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct pci_bus *bus, *child; struct pci_bus *bus, *child;
struct pci_host_bridge *bridge;
struct resource_entry *win; struct resource_entry *win;
resource_size_t io_base; resource_size_t io_base;
struct resource *mem; struct resource *mem;
...@@ -1295,10 +1296,12 @@ static int rockchip_pcie_probe(struct platform_device *pdev) ...@@ -1295,10 +1296,12 @@ static int rockchip_pcie_probe(struct platform_device *pdev)
if (!dev->of_node) if (!dev->of_node)
return -ENODEV; return -ENODEV;
rockchip = devm_kzalloc(dev, sizeof(*rockchip), GFP_KERNEL); bridge = devm_pci_alloc_host_bridge(dev, sizeof(*rockchip));
if (!rockchip) if (!bridge)
return -ENOMEM; return -ENOMEM;
rockchip = pci_host_bridge_priv(bridge);
platform_set_drvdata(pdev, rockchip); platform_set_drvdata(pdev, rockchip);
rockchip->dev = dev; rockchip->dev = dev;
...@@ -1396,11 +1399,18 @@ static int rockchip_pcie_probe(struct platform_device *pdev) ...@@ -1396,11 +1399,18 @@ static int rockchip_pcie_probe(struct platform_device *pdev)
goto err_free_res; goto err_free_res;
} }
bus = pci_scan_root_bus(&pdev->dev, 0, &rockchip_pcie_ops, rockchip, &res); list_splice_init(&res, &bridge->windows);
if (!bus) { bridge->dev.parent = &pdev->dev;
err = -ENOMEM; bridge->sysdata = rockchip;
bridge->busnr = 0;
bridge->ops = &rockchip_pcie_ops;
err = pci_scan_root_bus_bridge(bridge);
if (!err)
goto err_free_res; goto err_free_res;
}
bus = bridge->bus;
rockchip->root_bus = bus; rockchip->root_bus = bus;
pci_bus_size_bridges(bus); pci_bus_size_bridges(bus);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment