Skip to content

Commit

Permalink
unicore32/PCI: use pci_flags PCI_PROBE_ONLY instead of arm-specific flag
Browse files Browse the repository at this point in the history
CC: Guan Xuetao <gxt@mprc.pku.edu.cn>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
  • Loading branch information
Bjorn Helgaas committed Feb 24, 2012
1 parent 673c975 commit b9c40b0
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions arch/unicore32/kernel/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
#include <linux/slab.h>
#include <linux/init.h>
#include <linux/io.h>
#include <asm-generic/pci-bridge.h>

static int debug_pci;
static int use_firmware;

#define CONFIG_CMD(bus, devfn, where) \
(0x80000000 | (bus->number << 16) | (devfn << 8) | (where & ~3))
Expand Down Expand Up @@ -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.
*/
Expand All @@ -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;
Expand Down

0 comments on commit b9c40b0

Please sign in to comment.