hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s390/pci: rename pci_probe to s390_pci_probe 

pci_probe is too generic and has a name clash with other common code parts.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Heiko Carstens 2013-01-30 15:52:16 +01:00 committed by Martin Schwidefsky
parent a50b2eae8b
commit 1e5635d10d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/s390/include/asm/pci.h
View File

@ -186,7 +186,7 @@ void zpci_dma_exit(void);
extern struct mutex zpci_list_lock; extern struct mutex zpci_list_lock;
extern struct list_head zpci_list; extern struct list_head zpci_list;
extern struct pci_hp_callback_ops hotplug_ops; extern struct pci_hp_callback_ops hotplug_ops;
extern unsigned int pci_probe; extern unsigned int s390_pci_probe;
/* FMB */ /* FMB */
int zpci_fmb_enable_device(struct zpci_dev *); int zpci_fmb_enable_device(struct zpci_dev *);

8
arch/s390/pci/pci.c
View File

@ -1072,13 +1072,13 @@ static void zpci_mem_exit(void)
kmem_cache_destroy(zdev_fmb_cache); kmem_cache_destroy(zdev_fmb_cache);
} }
unsigned int pci_probe = 1; unsigned int s390_pci_probe = 1;
EXPORT_SYMBOL_GPL(pci_probe); EXPORT_SYMBOL_GPL(s390_pci_probe);
char * __init pcibios_setup(char *str) char * __init pcibios_setup(char *str)
{ {
if (!strcmp(str, "off")) { if (!strcmp(str, "off")) {
pci_probe = 0; s390_pci_probe = 0;
return NULL; return NULL;
} }
return str; return str;
@ -1088,7 +1088,7 @@ static int __init pci_base_init(void)
{ {
int rc; int rc;
if (!pci_probe) if (!s390_pci_probe)
return 0; return 0;
if (!test_facility(2) || !test_facility(69) if (!test_facility(2) || !test_facility(69)

2
drivers/pci/hotplug/s390_pci_hpc.c
View File

@ -231,7 +231,7 @@ static int __init pci_hotplug_s390_init(void)
* right now. * right now.
*/ */
if (!pci_probe) if (!s390_pci_probe)
return -EOPNOTSUPP; return -EOPNOTSUPP;
/* register callbacks for slot handling from arch code */ /* register callbacks for slot handling from arch code */