Commit 7ef1c871 authored by Rob Herring's avatar Rob Herring Committed by Lorenzo Pieralisi

PCI: iproc: Use pci_parse_request_of_pci_ranges()

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

There's no need to assign the resources to a temporary list, so just use
bridge->windows directly.
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: default avatarAndrew Murray <andrew.murray@arm.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Ray Jui <rjui@broadcom.com>
Cc: Scott Branden <sbranden@broadcom.com>
Cc: bcm-kernel-feedback-list@broadcom.com
parent 783a8625
...@@ -43,8 +43,6 @@ static int iproc_pcie_pltfm_probe(struct platform_device *pdev) ...@@ -43,8 +43,6 @@ static int iproc_pcie_pltfm_probe(struct platform_device *pdev)
struct iproc_pcie *pcie; struct iproc_pcie *pcie;
struct device_node *np = dev->of_node; struct device_node *np = dev->of_node;
struct resource reg; struct resource reg;
resource_size_t iobase = 0;
LIST_HEAD(resources);
struct pci_host_bridge *bridge; struct pci_host_bridge *bridge;
int ret; int ret;
...@@ -97,8 +95,7 @@ static int iproc_pcie_pltfm_probe(struct platform_device *pdev) ...@@ -97,8 +95,7 @@ static int iproc_pcie_pltfm_probe(struct platform_device *pdev)
if (IS_ERR(pcie->phy)) if (IS_ERR(pcie->phy))
return PTR_ERR(pcie->phy); return PTR_ERR(pcie->phy);
ret = devm_of_pci_get_host_bridge_resources(dev, 0, 0xff, &resources, ret = pci_parse_request_of_pci_ranges(dev, &bridge->windows, NULL);
&iobase);
if (ret) { if (ret) {
dev_err(dev, "unable to get PCI host bridge resources\n"); dev_err(dev, "unable to get PCI host bridge resources\n");
return ret; return ret;
...@@ -113,10 +110,9 @@ static int iproc_pcie_pltfm_probe(struct platform_device *pdev) ...@@ -113,10 +110,9 @@ static int iproc_pcie_pltfm_probe(struct platform_device *pdev)
pcie->map_irq = of_irq_parse_and_map_pci; pcie->map_irq = of_irq_parse_and_map_pci;
} }
ret = iproc_pcie_setup(pcie, &resources); ret = iproc_pcie_setup(pcie, &bridge->windows);
if (ret) { if (ret) {
dev_err(dev, "PCIe controller setup failed\n"); dev_err(dev, "PCIe controller setup failed\n");
pci_free_resource_list(&resources);
return ret; return ret;
} }
......
...@@ -1498,10 +1498,6 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res) ...@@ -1498,10 +1498,6 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res)
return ret; return ret;
} }
ret = devm_request_pci_bus_resources(dev, res);
if (ret)
return ret;
ret = phy_init(pcie->phy); ret = phy_init(pcie->phy);
if (ret) { if (ret) {
dev_err(dev, "unable to initialize PCIe PHY\n"); dev_err(dev, "unable to initialize PCIe PHY\n");
...@@ -1543,7 +1539,6 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res) ...@@ -1543,7 +1539,6 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res)
if (iproc_pcie_msi_enable(pcie)) if (iproc_pcie_msi_enable(pcie))
dev_info(dev, "not using iProc MSI\n"); dev_info(dev, "not using iProc MSI\n");
list_splice_init(res, &host->windows);
host->busnr = 0; host->busnr = 0;
host->dev.parent = dev; host->dev.parent = dev;
host->ops = &iproc_pcie_ops; host->ops = &iproc_pcie_ops;
......
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