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, Will Deacon <will@kernel.org> Subject: [PATCH 03/15] PCI: host-common: Use struct pci_host_bridge.windows list directly Date: Fri, 22 May 2020 17:48:20 -0600 [thread overview] Message-ID: <20200522234832.954484-4-robh@kernel.org> (raw) In-Reply-To: <20200522234832.954484-1-robh@kernel.org> There's no need to create a temporary resource list and then splice it to struct pci_host_bridge.windows list. Just use pci_host_bridge.windows directly. The necessary clean-up is already handled by the PCI core. Cc: Will Deacon <will@kernel.org> Signed-off-by: Rob Herring <robh@kernel.org> --- drivers/pci/controller/pci-host-common.c | 36 ++++++++---------------- 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/drivers/pci/controller/pci-host-common.c b/drivers/pci/controller/pci-host-common.c index 953de57f6c57..f8f71d99e427 100644 --- a/drivers/pci/controller/pci-host-common.c +++ b/drivers/pci/controller/pci-host-common.c @@ -21,7 +21,7 @@ static void gen_pci_unmap_cfg(void *ptr) } static struct pci_config_window *gen_pci_init(struct device *dev, - struct list_head *resources, const struct pci_ecam_ops *ops) + struct pci_host_bridge *bridge, const struct pci_ecam_ops *ops) { int err; struct resource cfgres; @@ -29,31 +29,25 @@ static struct pci_config_window *gen_pci_init(struct device *dev, struct pci_config_window *cfg; /* Parse our PCI ranges and request their resources */ - err = pci_parse_request_of_pci_ranges(dev, resources, NULL, &bus_range); + err = pci_parse_request_of_pci_ranges(dev, &bridge->windows, NULL, &bus_range); if (err) return ERR_PTR(err); err = of_address_to_resource(dev->of_node, 0, &cfgres); if (err) { dev_err(dev, "missing \"reg\" property\n"); - goto err_out; + return ERR_PTR(err); } cfg = pci_ecam_create(dev, &cfgres, bus_range, ops); - if (IS_ERR(cfg)) { - err = PTR_ERR(cfg); - goto err_out; - } + if (IS_ERR(cfg)) + return cfg; err = devm_add_action_or_reset(dev, gen_pci_unmap_cfg, cfg); - if (err) { - goto err_out; - } - return cfg; + if (err) + return ERR_PTR(err); -err_out: - pci_free_resource_list(resources); - return ERR_PTR(err); + return cfg; } int pci_host_common_probe(struct platform_device *pdev) @@ -61,9 +55,7 @@ int pci_host_common_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct pci_host_bridge *bridge; struct pci_config_window *cfg; - struct list_head resources; const struct pci_ecam_ops *ops; - int ret; ops = of_device_get_match_data(&pdev->dev); if (!ops) @@ -76,7 +68,7 @@ int pci_host_common_probe(struct platform_device *pdev) of_pci_check_probe_only(); /* Parse and map our Configuration Space windows */ - cfg = gen_pci_init(dev, &resources, ops); + cfg = gen_pci_init(dev, bridge, ops); if (IS_ERR(cfg)) return PTR_ERR(cfg); @@ -84,7 +76,6 @@ int pci_host_common_probe(struct platform_device *pdev) if (!pci_has_flag(PCI_PROBE_ONLY)) pci_add_flags(PCI_REASSIGN_ALL_BUS); - list_splice_init(&resources, &bridge->windows); bridge->dev.parent = dev; bridge->sysdata = cfg; bridge->busnr = cfg->busr.start; @@ -92,14 +83,9 @@ int pci_host_common_probe(struct platform_device *pdev) bridge->map_irq = of_irq_parse_and_map_pci; bridge->swizzle_irq = pci_common_swizzle; - ret = pci_host_probe(bridge); - if (ret < 0) { - pci_free_resource_list(&resources); - return ret; - } - platform_set_drvdata(pdev, bridge->bus); - return 0; + + return pci_host_probe(bridge); } EXPORT_SYMBOL_GPL(pci_host_common_probe); -- 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, Will Deacon <will@kernel.org>, linux-arm-kernel@lists.infradead.org Subject: [PATCH 03/15] PCI: host-common: Use struct pci_host_bridge.windows list directly Date: Fri, 22 May 2020 17:48:20 -0600 [thread overview] Message-ID: <20200522234832.954484-4-robh@kernel.org> (raw) In-Reply-To: <20200522234832.954484-1-robh@kernel.org> There's no need to create a temporary resource list and then splice it to struct pci_host_bridge.windows list. Just use pci_host_bridge.windows directly. The necessary clean-up is already handled by the PCI core. Cc: Will Deacon <will@kernel.org> Signed-off-by: Rob Herring <robh@kernel.org> --- drivers/pci/controller/pci-host-common.c | 36 ++++++++---------------- 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/drivers/pci/controller/pci-host-common.c b/drivers/pci/controller/pci-host-common.c index 953de57f6c57..f8f71d99e427 100644 --- a/drivers/pci/controller/pci-host-common.c +++ b/drivers/pci/controller/pci-host-common.c @@ -21,7 +21,7 @@ static void gen_pci_unmap_cfg(void *ptr) } static struct pci_config_window *gen_pci_init(struct device *dev, - struct list_head *resources, const struct pci_ecam_ops *ops) + struct pci_host_bridge *bridge, const struct pci_ecam_ops *ops) { int err; struct resource cfgres; @@ -29,31 +29,25 @@ static struct pci_config_window *gen_pci_init(struct device *dev, struct pci_config_window *cfg; /* Parse our PCI ranges and request their resources */ - err = pci_parse_request_of_pci_ranges(dev, resources, NULL, &bus_range); + err = pci_parse_request_of_pci_ranges(dev, &bridge->windows, NULL, &bus_range); if (err) return ERR_PTR(err); err = of_address_to_resource(dev->of_node, 0, &cfgres); if (err) { dev_err(dev, "missing \"reg\" property\n"); - goto err_out; + return ERR_PTR(err); } cfg = pci_ecam_create(dev, &cfgres, bus_range, ops); - if (IS_ERR(cfg)) { - err = PTR_ERR(cfg); - goto err_out; - } + if (IS_ERR(cfg)) + return cfg; err = devm_add_action_or_reset(dev, gen_pci_unmap_cfg, cfg); - if (err) { - goto err_out; - } - return cfg; + if (err) + return ERR_PTR(err); -err_out: - pci_free_resource_list(resources); - return ERR_PTR(err); + return cfg; } int pci_host_common_probe(struct platform_device *pdev) @@ -61,9 +55,7 @@ int pci_host_common_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct pci_host_bridge *bridge; struct pci_config_window *cfg; - struct list_head resources; const struct pci_ecam_ops *ops; - int ret; ops = of_device_get_match_data(&pdev->dev); if (!ops) @@ -76,7 +68,7 @@ int pci_host_common_probe(struct platform_device *pdev) of_pci_check_probe_only(); /* Parse and map our Configuration Space windows */ - cfg = gen_pci_init(dev, &resources, ops); + cfg = gen_pci_init(dev, bridge, ops); if (IS_ERR(cfg)) return PTR_ERR(cfg); @@ -84,7 +76,6 @@ int pci_host_common_probe(struct platform_device *pdev) if (!pci_has_flag(PCI_PROBE_ONLY)) pci_add_flags(PCI_REASSIGN_ALL_BUS); - list_splice_init(&resources, &bridge->windows); bridge->dev.parent = dev; bridge->sysdata = cfg; bridge->busnr = cfg->busr.start; @@ -92,14 +83,9 @@ int pci_host_common_probe(struct platform_device *pdev) bridge->map_irq = of_irq_parse_and_map_pci; bridge->swizzle_irq = pci_common_swizzle; - ret = pci_host_probe(bridge); - if (ret < 0) { - pci_free_resource_list(&resources); - return ret; - } - platform_set_drvdata(pdev, bridge->bus); - return 0; + + return pci_host_probe(bridge); } EXPORT_SYMBOL_GPL(pci_host_common_probe); -- 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 ` Rob Herring [this message] 2020-05-22 23:48 ` [PATCH 03/15] PCI: host-common: " 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 ` [PATCH 15/15] PCI: xilinx: " Rob Herring 2020-05-22 23:48 ` 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-4-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=will@kernel.org \ /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.