Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4fab044 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 6696cbc3

arch/arm/kernel/bios32.c

+2 −3
Original line number Diff line number Diff line
@@ -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;