UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

PCI: xilinx: Use pci_parse_request_of_pci_ranges() 

Convert the Xilinx host bridge to use the common
pci_parse_request_of_pci_ranges().

There's no need to assign the resources to a temporary list first. Just
use bridge->windows directly and remove all the temporary list handling.

Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Andrew Murray <andrew.murray@arm.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Rob Herring 2019-10-28 11:32:45 -05:00 committed by Lorenzo Pieralisi
parent 83083e241d
commit ee352c272e
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/pci/controller/pcie-xilinx.c
View File

@ -619,8 +619,6 @@ static int xilinx_pcie_probe(struct platform_device *pdev)
struct pci_bus *bus, *child; struct pci_bus *bus, *child;
struct pci_host_bridge *bridge; struct pci_host_bridge *bridge;
int err; int err;
resource_size_t iobase = 0;
LIST_HEAD(res);
if (!dev->of_node) if (!dev->of_node)
return -ENODEV; return -ENODEV;
@ -647,19 +645,12 @@ static int xilinx_pcie_probe(struct platform_device *pdev)
return err; return err;
} }
err = devm_of_pci_get_host_bridge_resources(dev, 0, 0xff, &res, err = pci_parse_request_of_pci_ranges(dev, &bridge->windows, NULL);
&iobase);
if (err) { if (err) {
dev_err(dev, "Getting bridge resources failed\n"); dev_err(dev, "Getting bridge resources failed\n");
return err; return err;
} }
err = devm_request_pci_bus_resources(dev, &res);
if (err)
goto error;
list_splice_init(&res, &bridge->windows);
bridge->dev.parent = dev; bridge->dev.parent = dev;
bridge->sysdata = port; bridge->sysdata = port;
bridge->busnr = 0; bridge->busnr = 0;
@ -673,7 +664,7 @@ static int xilinx_pcie_probe(struct platform_device *pdev)
#endif #endif
err = pci_scan_root_bus_bridge(bridge); err = pci_scan_root_bus_bridge(bridge);
if (err < 0) if (err < 0)
goto error; return err;
bus = bridge->bus; bus = bridge->bus;
@ -682,10 +673,6 @@ static int xilinx_pcie_probe(struct platform_device *pdev)
pcie_bus_configure_settings(child); pcie_bus_configure_settings(child);
pci_bus_add_devices(bus); pci_bus_add_devices(bus);
return 0; return 0;
error:
pci_free_resource_list(&res);
return err;
} }
static const struct of_device_id xilinx_pcie_of_match[] = { static const struct of_device_id xilinx_pcie_of_match[] = {