From: "Yinghai Lu" Subject: Re: [PATCH 7/16 v6] PCI: cleanup pcibios_allocate_resources() Date: Thu, 23 Oct 2008 00:10:26 -0700 Message-ID: <86802c440810230010redfbbe7oaf94bf2077ccdcdf@mail.gmail.com> References: <20081022083809.GA3757@yzhao12-linux.sh.intel.com> <20081022084241.GG3773@yzhao12-linux.sh.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: "linux-pci@vger.kernel.org" , "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: "Yu Zhao" Return-path: Received: from rv-out-0506.google.com ([209.85.198.228]:54022 "EHLO rv-out-0506.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755178AbYJWHK2 (ORCPT ); Thu, 23 Oct 2008 03:10:28 -0400 Received: by rv-out-0506.google.com with SMTP id k40so203364rvb.1 for ; Thu, 23 Oct 2008 00:10:26 -0700 (PDT) In-Reply-To: <20081022084241.GG3773@yzhao12-linux.sh.intel.com> Content-Disposition: inline Sender: kvm-owner@vger.kernel.org List-ID: On Wed, Oct 22, 2008 at 1:42 AM, Yu Zhao wrote: > 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; it seems you change the flow here for MMIO because PCI_COMMAND_MEMORY is 2. YH