diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2012-02-23 22:18:58 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-02-23 22:18:58 -0500 |
commit | 673c975624895c4db2edff32601d9c6475b2d39e (patch) | |
tree | d446b54ea15a6706a0ea8fd4c3a856ccd0596da6 /arch/powerpc/platforms/powernv/pci-ioda.c | |
parent | 3c13be017abe041e495862d50dbd83093e09cd6a (diff) |
powerpc/PCI: replace pci_probe_only with pci_flags
We already use pci_flags, so this just sets pci_flags directly and removes
the intermediate step of figuring out pci_probe_only, then using it to set
pci_flags.
The PCI core provides a pci_flags definition (currently __weak), so drop
the powerpc definitions in favor of that.
CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
CC: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'arch/powerpc/platforms/powernv/pci-ioda.c')
-rw-r--r-- | arch/powerpc/platforms/powernv/pci-ioda.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c index 5e155dfc4320..fbdd74dac3ac 100644 --- a/arch/powerpc/platforms/powernv/pci-ioda.c +++ b/arch/powerpc/platforms/powernv/pci-ioda.c | |||
@@ -1299,15 +1299,14 @@ void __init pnv_pci_init_ioda1_phb(struct device_node *np) | |||
1299 | /* Setup MSI support */ | 1299 | /* Setup MSI support */ |
1300 | pnv_pci_init_ioda_msis(phb); | 1300 | pnv_pci_init_ioda_msis(phb); |
1301 | 1301 | ||
1302 | /* We set both probe_only and PCI_REASSIGN_ALL_RSRC. This is an | 1302 | /* We set both PCI_PROBE_ONLY and PCI_REASSIGN_ALL_RSRC. This is an |
1303 | * odd combination which essentially means that we skip all resource | 1303 | * odd combination which essentially means that we skip all resource |
1304 | * fixups and assignments in the generic code, and do it all | 1304 | * fixups and assignments in the generic code, and do it all |
1305 | * ourselves here | 1305 | * ourselves here |
1306 | */ | 1306 | */ |
1307 | pci_probe_only = 1; | ||
1308 | ppc_md.pcibios_fixup_phb = pnv_pci_ioda_fixup_phb; | 1307 | ppc_md.pcibios_fixup_phb = pnv_pci_ioda_fixup_phb; |
1309 | ppc_md.pcibios_enable_device_hook = pnv_pci_enable_device_hook; | 1308 | ppc_md.pcibios_enable_device_hook = pnv_pci_enable_device_hook; |
1310 | pci_add_flags(PCI_REASSIGN_ALL_RSRC); | 1309 | pci_add_flags(PCI_PROBE_ONLY | PCI_REASSIGN_ALL_RSRC); |
1311 | 1310 | ||
1312 | /* Reset IODA tables to a clean state */ | 1311 | /* Reset IODA tables to a clean state */ |
1313 | rc = opal_pci_reset(phb_id, OPAL_PCI_IODA_TABLE_RESET, OPAL_ASSERT_RESET); | 1312 | rc = opal_pci_reset(phb_id, OPAL_PCI_IODA_TABLE_RESET, OPAL_ASSERT_RESET); |