Commit e63434f4 authored by Rob Herring's avatar Rob Herring Committed by Lorenzo Pieralisi
Browse files

PCI: host-common: Use struct pci_host_bridge.windows list directly 

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.

Link: https://lore.kernel.org/r/20200522234832.954484-4-robh@kernel.org


Signed-off-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Will Deacon <will@kernel.org>
parent c322fa0b

drivers/pci/controller/pci-host-common.c

+14 −28
Original line number Diff line number Diff line
@@ -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;

	}



	err = devm_add_action_or_reset(dev, gen_pci_unmap_cfg, cfg);

	if (err) {

		goto err_out;

	}

	if (IS_ERR(cfg))

		return cfg;



err_out:

	pci_free_resource_list(resources);

	err = devm_add_action_or_reset(dev, gen_pci_unmap_cfg, cfg);

	if (err)

		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,24 +83,19 @@ 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);



	platform_set_drvdata(pdev, bridge->bus);

	return 0;

	return pci_host_probe(bridge);

}

EXPORT_SYMBOL_GPL(pci_host_common_probe);



int pci_host_common_remove(struct platform_device *pdev)

{

	struct pci_bus *bus = platform_get_drvdata(pdev);

	struct pci_host_bridge *bridge = platform_get_drvdata(pdev);



	pci_lock_rescan_remove();

	pci_stop_root_bus(bus);

	pci_remove_root_bus(bus);

	pci_stop_root_bus(bridge->bus);

	pci_remove_root_bus(bridge->bus);

	pci_unlock_rescan_remove();



	return 0;