From mboxrd@z Thu Jan 1 00:00:00 1970 From: robherring2@gmail.com (Rob Herring) Date: Fri, 6 Mar 2015 08:19:51 -0600 Subject: [PATCH v5 16/29] powerpc/pci: Use pci_scan_host_bridge() for simplicity In-Reply-To: <1425634426-437-17-git-send-email-wangyijing@huawei.com> References: <1425634426-437-1-git-send-email-wangyijing@huawei.com> <1425634426-437-17-git-send-email-wangyijing@huawei.com> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Fri, Mar 6, 2015 at 3:33 AM, Yijing Wang wrote: > Now we could use pci_scan_host_bridge() to scan > pci buses, provide powerpc specific pci_host_bridge_ops. > > Suggested-by: Arnd Bergmann > Signed-off-by: Yijing Wang > CC: Benjamin Herrenschmidt > CC: linuxppc-dev at lists.ozlabs.org > Signed-off-by: Bjorn Helgaas > --- > 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