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@xxxxxxxxxx> --- 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 33803f7..c82d666 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c @@ -478,7 +478,7 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge) { - 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 7563855..948b675 100644 --- a/arch/x86/pci/acpi.c +++ b/arch/x86/pci/acpi.c @@ -462,7 +462,7 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge) { - 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 f5f5de6..9ed8ab7 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1931,6 +1931,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 -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html