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>

diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c
index 62a8ecd..a0cc4d2 100644 (file)
--- 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;