diff options
| author | Daniel Axtens <dja@axtens.net> | 2015-03-31 07:00:46 +0200 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-04-11 12:49:13 +0200 |
| commit | 542070baf4a0fe9de14cc2c4ca3ff1b43f14f90f (patch) | |
| tree | 768ab816acf7f3370116b6009d1bc8b8c843b5bd /arch/powerpc/kernel/pci-common.c | |
| parent | powerpc: Create pci_controller_ops.enable_device_hook and shim (diff) | |
| download | linux-542070baf4a0fe9de14cc2c4ca3ff1b43f14f90f.tar.xz linux-542070baf4a0fe9de14cc2c4ca3ff1b43f14f90f.zip | |
powerpc: Create pci_controller_ops.window_alignment and shim
Add pci_controller_ops.window_alignment,
shadowing ppc_md.pcibios_window_alignment.
Add a shim, and changes the callsites to use the shim.
Here, we use pci_window_alignment, as pcibios_window_alignment is
already taken.
Signed-off-by: Daniel Axtens <dja@axtens.net>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/kernel/pci-common.c')
| -rw-r--r-- | arch/powerpc/kernel/pci-common.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index 8639e9cd65d5..698e0328d9c3 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c @@ -109,15 +109,7 @@ void pcibios_free_controller(struct pci_controller *phb) resource_size_t pcibios_window_alignment(struct pci_bus *bus, unsigned long type) { - if (ppc_md.pcibios_window_alignment) - return ppc_md.pcibios_window_alignment(bus, type); - - /* - * PCI core will figure out the default - * alignment: 4KiB for I/O and 1MiB for - * memory window. - */ - return 1; + return pci_window_alignment(bus, type); } void pcibios_reset_secondary_bus(struct pci_dev *dev) |