diff options
author | Daniel Axtens <dja@axtens.net> | 2015-03-31 01:00:45 -0400 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-04-11 06:49:13 -0400 |
commit | b31e79f8d92ca115a935e37cfd4da74048739689 (patch) | |
tree | 15152735740773a6145bc929bd291e3a456a55df /arch/powerpc/kernel | |
parent | ff9df8c87d6807e90c5c3b0e1fd1649d09fd3bcd (diff) |
powerpc: Create pci_controller_ops.enable_device_hook and shim
Add pci_controller_ops.enable_device_hook,
shadowing ppc_md.pcibios_enable_device_hook.
Add a shim, and changes the callsites to use the shim.
Signed-off-by: Daniel Axtens <dja@axtens.net>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r-- | arch/powerpc/kernel/pci-common.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index b0de23c89ca5..8639e9cd65d5 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c | |||
@@ -1448,9 +1448,8 @@ EXPORT_SYMBOL_GPL(pcibios_finish_adding_to_bus); | |||
1448 | 1448 | ||
1449 | int pcibios_enable_device(struct pci_dev *dev, int mask) | 1449 | int pcibios_enable_device(struct pci_dev *dev, int mask) |
1450 | { | 1450 | { |
1451 | if (ppc_md.pcibios_enable_device_hook) | 1451 | if (!pcibios_enable_device_hook(dev)) |
1452 | if (!ppc_md.pcibios_enable_device_hook(dev)) | 1452 | return -EINVAL; |
1453 | return -EINVAL; | ||
1454 | 1453 | ||
1455 | return pci_enable_resources(dev, mask); | 1454 | return pci_enable_resources(dev, mask); |
1456 | } | 1455 | } |