summaryrefslogtreecommitdiffstats
path: root/arch/x86/pci/init.c
diff options
context:
space:
mode:
authorYinghai Lu <Yinghai.Lu@Sun.COM>2008-02-28 23:56:50 -0800
committerIngo Molnar <mingo@elte.hu>2008-04-26 23:41:04 +0200
commitbb63b4219976d48ed6d22ac33c18be334fb5a78c (patch)
treefd63e9c86b43f246a1f7011881540718118890c9 /arch/x86/pci/init.c
parentd2ebdf4bae4f1d7c30e71fd74f270ca4cda024fc (diff)
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>
Diffstat (limited to 'arch/x86/pci/init.c')
-rw-r--r--arch/x86/pci/init.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/x86/pci/init.c b/arch/x86/pci/init.c
index 2080b04b3bc..343c36337e6 100644
--- a/arch/x86/pci/init.c
+++ b/arch/x86/pci/init.c
@@ -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");