[PATCH part3 v12 06/10] PCI: Make pci_host_bridge hold sysdata in drvdata

Yijing Wang
2015-07-20T12:01:14Z

Now platform specific sysdata is saved in pci_bus,
and pcibios_root_bridge_prepare() need to know
the sysdata. Later, we would move pcibios_root_bridge_prepare()
prior to root bus creation, so we need to make
pci_host_bridge hold sysdata.

Signed-off-by: Yijing Wang <wangyijing@huawei.com>
---
arch/ia64/pci/pci.c | 2 +-
arch/x86/pci/acpi.c | 2 +-
drivers/pci/probe.c | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 67ffe1f..8f79852 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -485,7 +485,7 @@ int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)
* that case.
*/
if (!bridge->dev.parent) {
- struct pci_controller *controller = bridge->bus->sysdata;
+ struct pci_controller *controller = dev_get_drvdata(&bridge->dev);
ACPI_COMPANION_SET(&bridge->dev, controller->companion);
}
return 0;
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index 629fc3b..38ce348 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -502,7 +502,7 @@ int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)
* that case.
*/
if (!bridge->dev.parent) {
- struct pci_sysdata *sd = bridge->bus->sysdata;
+ struct pci_sysdata *sd = dev_get_drvdata(&bridge->dev);
ACPI_COMPANION_SET(&bridge->dev, sd->companion);
}
return 0;
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 0eba126..0ae8bf2 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1967,6 +1967,7 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int domain,
bridge->domain = domain;
bridge->dev.parent = parent;
bridge->dev.release = pci_release_host_bridge_dev;
+ dev_set_drvdata(&bridge->dev, sysdata);
dev_set_name(&bridge->dev, "pci%04x:%02x", pci_domain_nr(b), bus);
error = pcibios_root_bridge_prepare(bridge);
if (error) {
--
1.7.1