From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bjorn Helgaas Subject: [PATCH v2 11/12] unicore32/PCI: use pci_flags PCI_PROBE_ONLY instead of arm-specific flag Date: Thu, 23 Feb 2012 12:43:58 -0700 Message-ID: <20120223194358.20708.90268.stgit@bhelgaas.mtv.corp.google.com> References: <20120223194209.20708.54480.stgit@bhelgaas.mtv.corp.google.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20120223194209.20708.54480.stgit@bhelgaas.mtv.corp.google.com> Sender: linux-pci-owner@vger.kernel.org To: linux-pci@vger.kernel.org Cc: linux-arch@vger.kernel.org, Guan Xuetao List-Id: linux-arch.vger.kernel.org CC: Guan Xuetao Signed-off-by: Bjorn Helgaas --- arch/unicore32/kernel/pci.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/unicore32/kernel/pci.c b/arch/unicore32/kernel/pci.c index a8f07fe..6c1248f 100644 --- a/arch/unicore32/kernel/pci.c +++ b/arch/unicore32/kernel/pci.c @@ -19,9 +19,9 @@ #include #include #include +#include static int debug_pci; -static int use_firmware; #define CONFIG_CMD(bus, devfn, where) \ (0x80000000 | (bus->number << 16) | (devfn << 8) | (where & ~3)) @@ -276,7 +276,7 @@ static int __init pci_common_init(void) pci_fixup_irqs(pci_common_swizzle, pci_puv3_map_irq); - if (!use_firmware) { + if (!pci_has_flag(PCI_PROBE_ONLY)) { /* * Size the bridge windows. */ @@ -303,7 +303,7 @@ char * __devinit pcibios_setup(char *str) debug_pci = 1; return NULL; } else if (!strcmp(str, "firmware")) { - use_firmware = 1; + pci_add_flags(PCI_PROBE_ONLY); return NULL; } return str; From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qw0-f74.google.com ([209.85.216.74]:33001 "EHLO mail-qw0-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756518Ab2BWTn7 (ORCPT ); Thu, 23 Feb 2012 14:43:59 -0500 Received: by mail-qw0-f74.google.com with SMTP id b12so213840qad.1 for ; Thu, 23 Feb 2012 11:43:59 -0800 (PST) Subject: [PATCH v2 11/12] unicore32/PCI: use pci_flags PCI_PROBE_ONLY instead of arm-specific flag From: Bjorn Helgaas Date: Thu, 23 Feb 2012 12:43:58 -0700 Message-ID: <20120223194358.20708.90268.stgit@bhelgaas.mtv.corp.google.com> In-Reply-To: <20120223194209.20708.54480.stgit@bhelgaas.mtv.corp.google.com> References: <20120223194209.20708.54480.stgit@bhelgaas.mtv.corp.google.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-arch-owner@vger.kernel.org List-ID: To: linux-pci@vger.kernel.org Cc: linux-arch@vger.kernel.org, Guan Xuetao Message-ID: <20120223194358.UuYpNnm_QQ2SBa6a3b8Jm1w5beCgQMCW7_-FGbJoYig@z> CC: Guan Xuetao Signed-off-by: Bjorn Helgaas --- arch/unicore32/kernel/pci.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/unicore32/kernel/pci.c b/arch/unicore32/kernel/pci.c index a8f07fe..6c1248f 100644 --- a/arch/unicore32/kernel/pci.c +++ b/arch/unicore32/kernel/pci.c @@ -19,9 +19,9 @@ #include #include #include +#include static int debug_pci; -static int use_firmware; #define CONFIG_CMD(bus, devfn, where) \ (0x80000000 | (bus->number << 16) | (devfn << 8) | (where & ~3)) @@ -276,7 +276,7 @@ static int __init pci_common_init(void) pci_fixup_irqs(pci_common_swizzle, pci_puv3_map_irq); - if (!use_firmware) { + if (!pci_has_flag(PCI_PROBE_ONLY)) { /* * Size the bridge windows. */ @@ -303,7 +303,7 @@ char * __devinit pcibios_setup(char *str) debug_pci = 1; return NULL; } else if (!strcmp(str, "firmware")) { - use_firmware = 1; + pci_add_flags(PCI_PROBE_ONLY); return NULL; } return str;