From patchwork Sat Nov 14 00:33:58 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 59976 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nAE0XZYJ004040 for ; Sat, 14 Nov 2009 00:33:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932511AbZKNAdx (ORCPT ); Fri, 13 Nov 2009 19:33:53 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932547AbZKNAdx (ORCPT ); Fri, 13 Nov 2009 19:33:53 -0500 Received: from g1t0028.austin.hp.com ([15.216.28.35]:44494 "EHLO g1t0028.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932511AbZKNAdw (ORCPT ); Fri, 13 Nov 2009 19:33:52 -0500 Received: from g1t0039.austin.hp.com (g1t0039.austin.hp.com [16.236.32.45]) by g1t0028.austin.hp.com (Postfix) with ESMTP id ACA081C286; Sat, 14 Nov 2009 00:33:58 +0000 (UTC) Received: from ldl (linux.corp.hp.com [15.11.146.101]) by g1t0039.austin.hp.com (Postfix) with ESMTP id 8CC3B34077; Sat, 14 Nov 2009 00:33:58 +0000 (UTC) Received: from localhost (ldl.fc.hp.com [127.0.0.1]) by ldl (Postfix) with ESMTP id 572D2CF0012; Fri, 13 Nov 2009 17:33:58 -0700 (MST) Received: from ldl ([127.0.0.1]) by localhost (ldl.fc.hp.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id q-YfVTpj7qCk; Fri, 13 Nov 2009 17:33:58 -0700 (MST) Received: from eh.fc.hp.com (eh.fc.hp.com [15.11.146.105]) by ldl (Postfix) with ESMTP id 43D01CF0008; Fri, 13 Nov 2009 17:33:58 -0700 (MST) Received: from bob.kio (localhost [127.0.0.1]) by eh.fc.hp.com (Postfix) with ESMTP id 2997D26172; Fri, 13 Nov 2009 17:33:58 -0700 (MST) Subject: [PATCH v2 05/18] x86/PCI: MMCONFIG: simplify tests for empty pci_mmcfg_config table To: Jesse Barnes From: Bjorn Helgaas Cc: linux-pci@vger.kernel.org, x86@kernel.org, Yinghai Lu Date: Fri, 13 Nov 2009 17:33:58 -0700 Message-ID: <20091114003358.30492.4044.stgit@bob.kio> In-Reply-To: <20091114003135.30492.75626.stgit@bob.kio> References: <20091114003135.30492.75626.stgit@bob.kio> User-Agent: StGit/0.15 MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c index 62a8ecd..a0cc4d2 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;