UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

CC: Guan Xuetao <gxt@mprc.pku.edu.cn>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Bjorn Helgaas 2012-02-23 20:18:58 -07:00
parent 673c975624
commit b9c40b076c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/unicore32/kernel/pci.c
View File

@ -19,9 +19,9 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm-generic/pci-bridge.h>
static int debug_pci; static int debug_pci;
static int use_firmware;
#define CONFIG_CMD(bus, devfn, where) \ #define CONFIG_CMD(bus, devfn, where) \
(0x80000000 | (bus->number << 16) | (devfn << 8) | (where & ~3)) (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); pci_fixup_irqs(pci_common_swizzle, pci_puv3_map_irq);
if (!use_firmware) { if (!pci_has_flag(PCI_PROBE_ONLY)) {
/* /*
* Size the bridge windows. * Size the bridge windows.
*/ */
@ -303,7 +303,7 @@ char * __devinit pcibios_setup(char *str)
debug_pci = 1; debug_pci = 1;
return NULL; return NULL;
} else if (!strcmp(str, "firmware")) { } else if (!strcmp(str, "firmware")) {
use_firmware = 1; pci_add_flags(PCI_PROBE_ONLY);
return NULL; return NULL;
} }
return str; return str;