arm/PCI: use pci_flags PCI_PROBE_ONLY instead of arm-specific flag

CC: Russell King <linux@arm.linux.org.uk>
CC: linux-arm-kernel@lists.infradead.org
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c
index f3fd52b33e3d77c2ed624a007b56d847872d014f..8d7c22d7dff89a04f7e41b98591021eef8ea891a 100644 (file)
--- a/arch/arm/kernel/bios32.c
+++ b/arch/arm/kernel/bios32.c
@@ -16,7 +16,6 @@
 #include <asm/mach/pci.h>
 
 static int debug_pci;
-static int use_firmware;
 
 /*
  * We can't use pci_find_device() here since we are
@@ -537,7 +536,7 @@ void __init pci_common_init(struct hw_pci *hw)
        list_for_each_entry(sys, &hw->buses, node) {
                struct pci_bus *bus = sys->bus;
 
-               if (!use_firmware) {
+               if (!pci_has_flag(PCI_PROBE_ONLY)) {
                        /*
                         * Size the bridge windows.
                         */
@@ -575,7 +574,7 @@ char * __init 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;