From: Rob Herring <robh@kernel.org> To: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: Bjorn Helgaas <bhelgaas@google.com>, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Michal Simek <michal.simek@xilinx.com> Subject: [PATCH 15/15] PCI: xilinx: Use pci_host_probe() to register host Date: Fri, 22 May 2020 17:48:32 -0600 [thread overview] Message-ID: <20200522234832.954484-16-robh@kernel.org> (raw) In-Reply-To: <20200522234832.954484-1-robh@kernel.org> The xilinx 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: Michal Simek <michal.simek@xilinx.com> Signed-off-by: Rob Herring <robh@kernel.org> --- drivers/pci/controller/pcie-xilinx.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/pci/controller/pcie-xilinx.c b/drivers/pci/controller/pcie-xilinx.c index 98e55297815b..05547497f391 100644 --- a/drivers/pci/controller/pcie-xilinx.c +++ b/drivers/pci/controller/pcie-xilinx.c @@ -616,7 +616,6 @@ 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; @@ -663,17 +662,7 @@ static int xilinx_pcie_probe(struct platform_device *pdev) xilinx_pcie_msi_chip.dev = dev; bridge->msi = &xilinx_pcie_msi_chip; #endif - err = pci_scan_root_bus_bridge(bridge); - if (err < 0) - return err; - - bus = bridge->bus; - - pci_assign_unassigned_bus_resources(bus); - list_for_each_entry(child, &bus->children, node) - pcie_bus_configure_settings(child); - pci_bus_add_devices(bus); - return 0; + return pci_host_probe(bridge); } static const struct of_device_id xilinx_pcie_of_match[] = { -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Rob Herring <robh@kernel.org> To: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: Bjorn Helgaas <bhelgaas@google.com>, linux-pci@vger.kernel.org, Michal Simek <michal.simek@xilinx.com>, linux-arm-kernel@lists.infradead.org Subject: [PATCH 15/15] PCI: xilinx: Use pci_host_probe() to register host Date: Fri, 22 May 2020 17:48:32 -0600 [thread overview] Message-ID: <20200522234832.954484-16-robh@kernel.org> (raw) In-Reply-To: <20200522234832.954484-1-robh@kernel.org> The xilinx 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: Michal Simek <michal.simek@xilinx.com> Signed-off-by: Rob Herring <robh@kernel.org> --- drivers/pci/controller/pcie-xilinx.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/pci/controller/pcie-xilinx.c b/drivers/pci/controller/pcie-xilinx.c index 98e55297815b..05547497f391 100644 --- a/drivers/pci/controller/pcie-xilinx.c +++ b/drivers/pci/controller/pcie-xilinx.c @@ -616,7 +616,6 @@ 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; @@ -663,17 +662,7 @@ static int xilinx_pcie_probe(struct platform_device *pdev) xilinx_pcie_msi_chip.dev = dev; bridge->msi = &xilinx_pcie_msi_chip; #endif - err = pci_scan_root_bus_bridge(bridge); - if (err < 0) - return err; - - bus = bridge->bus; - - pci_assign_unassigned_bus_resources(bus); - list_for_each_entry(child, &bus->children, node) - pcie_bus_configure_settings(child); - pci_bus_add_devices(bus); - return 0; + return pci_host_probe(bridge); } static const struct of_device_id xilinx_pcie_of_match[] = { -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-05-22 23:48 UTC|newest] Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-05-22 23:48 [PATCH 00/15] PCI controller probe cleanups Rob Herring 2020-05-22 23:48 ` Rob Herring 2020-05-22 23:48 ` [PATCH 01/15] PCI: cadence: Use struct pci_host_bridge.windows list directly Rob Herring 2020-05-22 23:48 ` Rob Herring 2020-05-22 23:48 ` [PATCH 02/15] PCI: mvebu: " Rob Herring 2020-05-22 23:48 ` Rob Herring 2020-05-22 23:48 ` [PATCH 03/15] PCI: host-common: " Rob Herring 2020-05-22 23:48 ` Rob Herring 2020-05-22 23:48 ` [PATCH 04/15] PCI: brcmstb: Use pci_host_probe() to register host Rob Herring 2020-05-22 23:48 ` Rob Herring 2020-06-18 10:54 ` Nicolas Saenz Julienne 2020-06-18 10:54 ` Nicolas Saenz Julienne 2020-05-22 23:48 ` [PATCH 05/15] PCI: mobiveil: " Rob Herring 2020-05-22 23:48 ` Rob Herring [not found] ` <20200522234832.954484-1-robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> 2020-05-22 23:48 ` [PATCH 06/15] PCI: tegra: " Rob Herring 2020-05-22 23:48 ` Rob Herring 2020-05-22 23:48 ` Rob Herring 2020-05-22 23:48 ` [PATCH 07/15] PCI: v3: " Rob Herring 2020-05-22 23:48 ` Rob Herring 2020-05-25 11:38 ` Linus Walleij 2020-05-25 11:38 ` Linus Walleij 2020-05-22 23:48 ` [PATCH 08/15] PCI: versatile: " Rob Herring 2020-05-22 23:48 ` Rob Herring 2020-05-22 23:48 ` [PATCH 09/15] PCI: xgene: " Rob Herring 2020-05-22 23:48 ` Rob Herring 2020-05-22 23:48 ` [PATCH 10/15] PCI: altera: " Rob Herring 2020-05-22 23:48 ` Rob Herring 2020-06-02 1:02 ` Tan, Ley Foon 2020-06-02 1:02 ` Tan, Ley Foon 2020-05-22 23:48 ` [PATCH 11/15] PCI: iproc: " Rob Herring 2020-05-22 23:48 ` Rob Herring 2020-05-28 17:53 ` Scott Branden 2020-05-28 17:53 ` Scott Branden 2020-05-22 23:48 ` [PATCH 12/15] PCI: rcar: " Rob Herring 2020-05-22 23:48 ` Rob Herring 2020-05-25 8:31 ` Geert Uytterhoeven 2020-05-25 8:31 ` Geert Uytterhoeven 2020-05-22 23:48 ` [PATCH 13/15] PCI: rockchip: " Rob Herring 2020-05-22 23:48 ` Rob Herring 2020-05-22 23:48 ` [PATCH 14/15] PCI: xilinx-nwl: " Rob Herring 2020-05-22 23:48 ` Rob Herring 2020-05-25 6:44 ` Michal Simek 2020-05-25 6:44 ` Michal Simek 2020-05-22 23:48 ` Rob Herring [this message] 2020-05-22 23:48 ` [PATCH 15/15] PCI: xilinx: " Rob Herring 2020-05-25 6:44 ` Michal Simek 2020-05-25 6:44 ` Michal Simek 2020-07-06 9:04 ` [PATCH 00/15] PCI controller probe cleanups Lorenzo Pieralisi 2020-07-06 9:04 ` Lorenzo Pieralisi
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200522234832.954484-16-robh@kernel.org \ --to=robh@kernel.org \ --cc=bhelgaas@google.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-pci@vger.kernel.org \ --cc=lorenzo.pieralisi@arm.com \ --cc=michal.simek@xilinx.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.