summaryrefslogtreecommitdiff
path: root/arch/x86/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2009-11-13 17:33:58 -0700
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-11-24 15:28:56 -0800
commit463a5df175e3ceed684397ee2f8a3eb523d835a0 (patch)
tree014a58e87375f36c58fa4ffbc739e85672e534b0 /arch/x86/pci
parent7da7d360ae025158d09aab18d66f5d2fe3c02252 (diff)
downloadlinux-3.10-463a5df175e3ceed684397ee2f8a3eb523d835a0.tar.gz
linux-3.10-463a5df175e3ceed684397ee2f8a3eb523d835a0.tar.bz2
linux-3.10-463a5df175e3ceed684397ee2f8a3eb523d835a0.zip
x86/PCI: MMCONFIG: simplify tests for empty pci_mmcfg_config table
We never set pci_mmcfg_config unless we increment pci_mmcfg_config_num, so there's no need to test both pci_mmcfg_config_num and pci_mmcfg_config. Reviewed-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'arch/x86/pci')
-rw-r--r--arch/x86/pci/mmconfig-shared.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c
index 62a8ecd9698..a0cc4d2efb8 100644
--- a/arch/x86/pci/mmconfig-shared.c
+++ b/arch/x86/pci/mmconfig-shared.c
@@ -472,7 +472,6 @@ static void __init pci_mmcfg_reject_broken(int early)
int i;
if ((pci_mmcfg_config_num == 0) ||
- (pci_mmcfg_config == NULL) ||
(pci_mmcfg_config[0].address == 0))
return;
@@ -618,7 +617,6 @@ static void __init __pci_mmcfg_init(int early)
pci_mmcfg_reject_broken(early);
if ((pci_mmcfg_config_num == 0) ||
- (pci_mmcfg_config == NULL) ||
(pci_mmcfg_config[0].address == 0))
return;
@@ -652,7 +650,6 @@ static int __init pci_mmcfg_late_insert_resources(void)
if ((pci_mmcfg_resources_inserted == 1) ||
(pci_probe & PCI_PROBE_MMCONF) == 0 ||
(pci_mmcfg_config_num == 0) ||
- (pci_mmcfg_config == NULL) ||
(pci_mmcfg_config[0].address == 0))
return 1;