diff options
Diffstat (limited to 'arch/powerpc/kernel/pci-common.c')
-rw-r--r-- | arch/powerpc/kernel/pci-common.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index eb341be9a4d9..3cd85faa8ac6 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c | |||
@@ -1688,13 +1688,8 @@ int early_find_capability(struct pci_controller *hose, int bus, int devfn, | |||
1688 | /** | 1688 | /** |
1689 | * pci_scan_phb - Given a pci_controller, setup and scan the PCI bus | 1689 | * pci_scan_phb - Given a pci_controller, setup and scan the PCI bus |
1690 | * @hose: Pointer to the PCI host controller instance structure | 1690 | * @hose: Pointer to the PCI host controller instance structure |
1691 | * @sysdata: value to use for sysdata pointer. ppc32 and ppc64 differ here | ||
1692 | * | ||
1693 | * Note: the 'data' pointer is a temporary measure. As 32 and 64 bit | ||
1694 | * pci code gets merged, this parameter should become unnecessary because | ||
1695 | * both will use the same value. | ||
1696 | */ | 1691 | */ |
1697 | void __devinit pcibios_scan_phb(struct pci_controller *hose, void *sysdata) | 1692 | void __devinit pcibios_scan_phb(struct pci_controller *hose) |
1698 | { | 1693 | { |
1699 | struct pci_bus *bus; | 1694 | struct pci_bus *bus; |
1700 | struct device_node *node = hose->dn; | 1695 | struct device_node *node = hose->dn; |
@@ -1704,13 +1699,13 @@ void __devinit pcibios_scan_phb(struct pci_controller *hose, void *sysdata) | |||
1704 | node ? node->full_name : "<NO NAME>"); | 1699 | node ? node->full_name : "<NO NAME>"); |
1705 | 1700 | ||
1706 | /* Create an empty bus for the toplevel */ | 1701 | /* Create an empty bus for the toplevel */ |
1707 | bus = pci_create_bus(hose->parent, hose->first_busno, hose->ops, | 1702 | bus = pci_create_bus(hose->parent, hose->first_busno, hose->ops, hose); |
1708 | sysdata); | ||
1709 | if (bus == NULL) { | 1703 | if (bus == NULL) { |
1710 | pr_err("Failed to create bus for PCI domain %04x\n", | 1704 | pr_err("Failed to create bus for PCI domain %04x\n", |
1711 | hose->global_number); | 1705 | hose->global_number); |
1712 | return; | 1706 | return; |
1713 | } | 1707 | } |
1708 | bus->dev.of_node = of_node_get(node); | ||
1714 | bus->secondary = hose->first_busno; | 1709 | bus->secondary = hose->first_busno; |
1715 | hose->bus = bus; | 1710 | hose->bus = bus; |
1716 | 1711 | ||