diff options
| author | Rob Herring <robh@kernel.org> | 2020-07-21 20:25:09 -0600 |
|---|---|---|
| committer | Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> | 2020-07-23 17:13:13 +0100 |
| commit | 61f11f8250e2dc7acde8d9e09ddae3a70cbe1a6f (patch) | |
| tree | 98c5c03e9e47a191802a3ecb5aeaee101a6b8381 | |
| parent | ec64e2795988322bf33aaf0f0935e0f1b4da0ed2 (diff) | |
| download | linux-stable-61f11f8250e2dc7acde8d9e09ddae3a70cbe1a6f.tar.gz linux-stable-61f11f8250e2dc7acde8d9e09ddae3a70cbe1a6f.tar.bz2 linux-stable-61f11f8250e2dc7acde8d9e09ddae3a70cbe1a6f.zip | |
PCI: rcar: Use devm_pci_alloc_host_bridge()
Move to the resource managed devm_pci_alloc_host_bridge() and simplify
the error path.
Link: https://lore.kernel.org/r/20200722022514.1283916-15-robh@kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-renesas-soc@vger.kernel.org
| -rw-r--r-- | drivers/pci/controller/pcie-rcar-host.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/pci/controller/pcie-rcar-host.c b/drivers/pci/controller/pcie-rcar-host.c index 58f4d339eb0c..c470bff5af0f 100644 --- a/drivers/pci/controller/pcie-rcar-host.c +++ b/drivers/pci/controller/pcie-rcar-host.c @@ -940,7 +940,7 @@ static int rcar_pcie_probe(struct platform_device *pdev) int err; struct pci_host_bridge *bridge; - bridge = pci_alloc_host_bridge(sizeof(*host)); + bridge = devm_pci_alloc_host_bridge(dev, sizeof(*host)); if (!bridge) return -ENOMEM; @@ -952,7 +952,7 @@ static int rcar_pcie_probe(struct platform_device *pdev) err = pci_parse_request_of_pci_ranges(dev, &host->resources, &bridge->dma_ranges, NULL); if (err) - goto err_free_bridge; + return err; pm_runtime_enable(pcie->dev); err = pm_runtime_get_sync(pcie->dev); @@ -1034,9 +1034,6 @@ err_pm_disable: pm_runtime_disable(dev); pci_free_resource_list(&host->resources); -err_free_bridge: - pci_free_host_bridge(bridge); - return err; } |