| Message ID | 20200522234832.954484-11-robh@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | PCI controller probe cleanups | expand |
> -----Original Message----- > From: Rob Herring <robh@kernel.org> > Sent: Saturday, May 23, 2020 7:48 AM > To: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> > Cc: Bjorn Helgaas <bhelgaas@google.com>; linux-pci@vger.kernel.org; > linux-arm-kernel@lists.infradead.org; Tan, Ley Foon > <ley.foon.tan@intel.com>; rfi@lists.rocketboards.org > Subject: [PATCH 10/15] PCI: altera: Use pci_host_probe() to register host > > The altera host driver does the same host registration and bus scanning calls > as pci_host_probe, so let's use it instead. > > The only difference is pci_assign_unassigned_bus_resources() was called > instead of pci_bus_size_bridges() and pci_bus_assign_resources(). This > should be the same. > > Cc: Ley Foon Tan <ley.foon.tan@intel.com> > Cc: rfi@lists.rocketboards.org > Signed-off-by: Rob Herring <robh@kernel.org> > --- > drivers/pci/controller/pcie-altera.c | 17 +---------------- > 1 file changed, 1 insertion(+), 16 deletions(-) > Reviewed-by: Ley Foon Tan <ley.foon.tan@intel.com> Regards Ley Foon
diff --git a/drivers/pci/controller/pcie-altera.c b/drivers/pci/controller/pcie-altera.c index 24cb1c331058..26ac3ad81de0 100644 --- a/drivers/pci/controller/pcie-altera.c +++ b/drivers/pci/controller/pcie-altera.c @@ -773,8 +773,6 @@ static int altera_pcie_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct altera_pcie *pcie; - struct pci_bus *bus; - struct pci_bus *child; struct pci_host_bridge *bridge; int ret; const struct of_device_id *match; @@ -825,20 +823,7 @@ static int altera_pcie_probe(struct platform_device *pdev) bridge->map_irq = of_irq_parse_and_map_pci; bridge->swizzle_irq = pci_common_swizzle; - ret = pci_scan_root_bus_bridge(bridge); - if (ret < 0) - return ret; - - bus = bridge->bus; - - pci_assign_unassigned_bus_resources(bus); - - /* Configure PCI Express setting. */ - list_for_each_entry(child, &bus->children, node) - pcie_bus_configure_settings(child); - - pci_bus_add_devices(bus); - return ret; + return pci_host_probe(bridge); } static int altera_pcie_remove(struct platform_device *pdev)
The altera host driver does the same host registration and bus scanning calls as pci_host_probe, so let's use it instead. The only difference is pci_assign_unassigned_bus_resources() was called instead of pci_bus_size_bridges() and pci_bus_assign_resources(). This should be the same. Cc: Ley Foon Tan <ley.foon.tan@intel.com> Cc: rfi@lists.rocketboards.org Signed-off-by: Rob Herring <robh@kernel.org> --- drivers/pci/controller/pcie-altera.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-)