Commit a574795b authored Nov 09, 2015 by Lorenzo Pieralisi Committed by Bjorn Helgaas Nov 25, 2015

PCI: generic,versatile: Remove unused pci_sys_data structures



Commit b3a72384 ("ARM/PCI: Replace pci_sys_data->align_resource with
global function pointer") removed the struct pci_sys_data dependency from
the ARM pcibios functions that are part of the common ARM PCI arch
back-end, e.g., pcibios_align_resource(), so that struct pci_sys_data has
now become data that is only used internally by the ARM bios32 layer, i.e.,
pci_common_init_dev(), and by host controllers drivers callbacks, e.g.,
pci_sys_data.setup, that rely on the ARM bios32 API to probe.

PCI host controller drivers that do not rely on ARM bios32 calls to probe
do not need to have the pci_bus.sysdata pointer field pointing at a struct
pci_sys_data anymore, therefore it can be removed from the respective
drivers data structures.

Remove the pci_sys_data structures from the host controller drivers that do
not rely on ARM bios32 interface to scan the PCI bus, completing the
pci_sys_data clean-up and removing the related dependency on arch/arm
specific data.

Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
CC: Will Deacon <will.deacon@arm.com>
CC: Rob Herring <robh@kernel.org>

parent 1ec21837

drivers/pci/host/pci-host-generic.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -38,16 +38,7 @@ struct gen_pci_cfg_windows {
		struct gen_pci_cfg_bus_ops *ops;
		};

		/*
		* ARM pcibios functions expect the ARM struct pci_sys_data as the PCI
		* sysdata. Add pci_sys_data as the first element in struct gen_pci so
		* that when we use a gen_pci pointer as sysdata, it is also a pointer to
		* a struct pci_sys_data.
		*/
		struct gen_pci {
		#ifdef CONFIG_ARM
		struct pci_sys_data sys;
		#endif
		struct pci_host_bridge host;
		struct gen_pci_cfg_windows cfg;
		struct list_head resources;

drivers/pci/host/pci-versatile.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -125,9 +125,6 @@ static int versatile_pci_parse_request_of_pci_ranges(struct device *dev,
		return err;
		}

		/* Unused, temporary to satisfy ARM arch code */
		struct pci_sys_data sys;

		static int versatile_pci_probe(struct platform_device *pdev)
		{
		struct resource *res;
		@@ -208,7 +205,7 @@ static int versatile_pci_probe(struct platform_device *pdev)
		pci_add_flags(PCI_ENABLE_PROC_DOMAINS);
		pci_add_flags(PCI_REASSIGN_ALL_BUS \| PCI_REASSIGN_ALL_RSRC);

		bus = pci_scan_root_bus(&pdev->dev, 0, &pci_versatile_ops, &sys, &pci_res);
		bus = pci_scan_root_bus(&pdev->dev, 0, &pci_versatile_ops, NULL, &pci_res);
		if (!bus)
		return -ENOMEM;