From: Yu Zhao Subject: [PATCH 7/16 v6] PCI: cleanup pcibios_allocate_resources() Date: Wed, 22 Oct 2008 16:42:41 +0800 Message-ID: <20081022084241.GG3773@yzhao12-linux.sh.intel.com> References: <20081022083809.GA3757@yzhao12-linux.sh.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: "achiang@hp.com" , "grundler@parisc-linux.org" , "greg@kroah.com" , "mingo@elte.hu" , "jbarnes@virtuousgeek.org" , "matthew@wil.cx" , "randy.dunlap@oracle.com" , "rdreier@cisco.com" , "linux-kernel@vger.kernel.org" , "kvm@vger.kernel.org" , "virtualization@lists.linux-foundation.org" To: "linux-pci@vger.kernel.org" Return-path: Received: from mga09.intel.com ([134.134.136.24]:51483 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755455AbYJVJiU (ORCPT ); Wed, 22 Oct 2008 05:38:20 -0400 Content-Disposition: inline In-Reply-To: <20081022083809.GA3757@yzhao12-linux.sh.intel.com> Sender: kvm-owner@vger.kernel.org List-ID: This cleanup makes pcibios_allocate_resources() easier to read. Cc: Alex Chiang Cc: Grant Grundler Cc: Greg KH Cc: Ingo Molnar Cc: Jesse Barnes Cc: Matthew Wilcox Cc: Randy Dunlap Cc: Roland Dreier Signed-off-by: Yu Zhao --- arch/x86/pci/i386.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c index 844df0c..8729bde 100644 --- a/arch/x86/pci/i386.c +++ b/arch/x86/pci/i386.c @@ -147,7 +147,7 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list) static void __init pcibios_allocate_resources(int pass) { struct pci_dev *dev = NULL; - int idx, disabled; + int idx, enabled; u16 command; struct resource *r, *pr; @@ -160,22 +160,22 @@ static void __init pcibios_allocate_resources(int pass) if (!r->start) /* Address not assigned at all */ continue; if (r->flags & IORESOURCE_IO) - disabled = !(command & PCI_COMMAND_IO); + enabled = command & PCI_COMMAND_IO; else - disabled = !(command & PCI_COMMAND_MEMORY); - if (pass == disabled) { - dev_dbg(&dev->dev, "resource %#08llx-%#08llx (f=%lx, d=%d, p=%d)\n", + enabled = command & PCI_COMMAND_MEMORY; + if (pass == enabled) + continue; + dev_dbg(&dev->dev, "resource %#08llx-%#08llx (f=%lx, d=%d, p=%d)\n", (unsigned long long) r->start, (unsigned long long) r->end, - r->flags, disabled, pass); - pr = pci_find_parent_resource(dev, r); - if (!pr || request_resource(pr, r) < 0) { - dev_err(&dev->dev, "BAR %d: can't allocate resource\n", idx); - /* We'll assign a new address later */ - r->end -= r->start; - r->start = 0; - } - } + r->flags, enabled, pass); + pr = pci_find_parent_resource(dev, r); + if (pr && !request_resource(pr, r)) + continue; + dev_err(&dev->dev, "BAR %d: can't allocate resource\n", idx); + /* We'll assign a new address later */ + r->end -= r->start; + r->start = 0; } if (!pass) { r = &dev->resource[PCI_ROM_RESOURCE]; -- 1.5.6.4