[PATCH v2 07/10] PCI: Convert of_pci_get_host_bridge_resources() users to devm variant
From: Vladimir Zapolskiy <hidden>
Date: 2018-05-03 07:18:31
Also in:
linux-pci, lkml
Hi Jan, On 04/30/2018 08:48 AM, Jan Kiszka wrote:
From: Jan Kiszka <jan.kiszka@siemens.com> Straightforward for all of them, no more leaks afterwards. CC: Jingoo Han <jingoohan1@gmail.com> CC: Joao Pinto <redacted> CC: Lorenzo Pieralisi <redacted> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Acked-by: Jingoo Han <redacted>
[snip]
quoted hunk ↗ jump to hunk
diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c index 6ab28f29ac6a..6eb36c924983 100644 --- a/drivers/pci/host/pcie-rcar.c +++ b/drivers/pci/host/pcie-rcar.c@@ -1067,12 +1067,11 @@ static int rcar_pcie_parse_request_of_pci_ranges(struct rcar_pcie *pci) { int err; struct device *dev = pci->dev; - struct device_node *np = dev->of_node; resource_size_t iobase; struct resource_entry *win, *tmp; - err = of_pci_get_host_bridge_resources(np, 0, 0xff, &pci->resources, - &iobase); + err = devm_of_pci_get_host_bridge_resources(dev, 0, 0xff, + &pci->resources, &iobase); if (err) return err;
this one snippet is obsoleted by https://patchwork.ozlabs.org/patch/904326/ If 08/10 remains a deprecation, then it is sufficient to exclude the R-Car change, otherwise I hope maintainers can deal with the proper ordering. For PCI OF change:
quoted hunk ↗ jump to hunk
diff --git a/drivers/pci/of.c b/drivers/pci/of.c index f16b343d3b85..5a88d46a41b7 100644 --- a/drivers/pci/of.c +++ b/drivers/pci/of.c@@ -645,12 +645,12 @@ int pci_parse_request_of_pci_ranges(struct device *dev, struct resource **bus_range) { int err, res_valid = 0; - struct device_node *np = dev->of_node; resource_size_t iobase; struct resource_entry *win, *tmp; INIT_LIST_HEAD(resources); - err = of_pci_get_host_bridge_resources(np, 0, 0xff, resources, &iobase); + err = devm_of_pci_get_host_bridge_resources(dev, 0, 0xff, resources, + &iobase); if (err) return err;
Reviewed-by: Vladimir Zapolskiy <redacted> Tested-by: Vladimir Zapolskiy <redacted> -- With best wishes, Vladimir