x86 pci: remove checking type for mmconfig probe

doesn't need to check if it is type1 or type2, we can use raw_pci_ops
directly.

also make pci_direct_conf1 static again.

anyway is there system with type 2 and mmconf support?

Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Yinghai Lu
2008-02-28 23:56:50 -08:00
committed by Ingo Molnar
parent d2ebdf4bae
commit bb63b42199
4 changed files with 27 additions and 28 deletions

View File

@ -6,14 +6,13 @@
in the right sequence from here. */
static __init int pci_access_init(void)
{
int type __maybe_unused = 0;
#ifdef CONFIG_PCI_DIRECT
int type = 0;
type = pci_direct_probe();
#endif
pci_mmcfg_early_init(type);
if (raw_pci_ops)
return 0;
pci_mmcfg_early_init();
#ifdef CONFIG_PCI_BIOS
pci_pcbios_init();
#endif
@ -26,7 +25,7 @@ static __init int pci_access_init(void)
#ifdef CONFIG_PCI_DIRECT
pci_direct_init(type);
#endif
if (!raw_pci_ops)
if (!raw_pci_ops && !raw_pci_ext_ops)
printk(KERN_ERR
"PCI: Fatal: No config space access function found\n");