[PATCH v5 16/29] powerpc/pci: Use pci_scan_host_bridge() for simplicity
From: Rob Herring <hidden>
Date: 2015-03-06 14:20:20
Also in:
linux-alpha, linux-pci, linuxppc-dev, lkml
From: Rob Herring <hidden>
Date: 2015-03-06 14:20:20
Also in:
linux-alpha, linux-pci, linuxppc-dev, lkml
On Fri, Mar 6, 2015 at 3:33 AM, Yijing Wang [off-list ref] wrote:
Now we could use pci_scan_host_bridge() to scan pci buses, provide powerpc specific pci_host_bridge_ops. Suggested-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Yijing Wang <redacted> CC: Benjamin Herrenschmidt <benh@kernel.crashing.org> CC: linuxppc-dev at lists.ozlabs.org Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> --- arch/powerpc/include/asm/machdep.h | 2 +- arch/powerpc/kernel/pci-common.c | 63 ++++++++++++++++++------------ arch/powerpc/platforms/pseries/pci.c | 8 ++-- arch/powerpc/platforms/pseries/pseries.h | 2 +- 4 files changed, 44 insertions(+), 31 deletions(-)diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h index 8e7f2a8..b811d12 100644 --- a/arch/powerpc/include/asm/machdep.h +++ b/arch/powerpc/include/asm/machdep.h@@ -129,7 +129,7 @@ struct machdep_calls { void (*pcibios_fixup)(void); int (*pci_probe_mode)(struct pci_bus *); void (*pci_irq_fixup)(struct pci_dev *dev); - int (*pcibios_set_root_bus_speed)(struct pci_host_bridge + void (*pcibios_set_root_bus_speed)(struct pci_host_bridge *bridge);
Shouldn't this be part of patch 15? Rob