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>

3 files changed, 6 insertions, 6 deletions

diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h
index 23d6a245e8a7..6383c44c6629 100644
--- a/arch/s390/include/asm/pci.h
+++ b/arch/s390/include/asm/pci.h
@@ -186,7 +186,7 @@ void zpci_dma_exit(void);
 extern struct mutex zpci_list_lock;
 extern struct list_head zpci_list;
 extern struct pci_hp_callback_ops hotplug_ops;
-extern unsigned int pci_probe;
+extern unsigned int s390_pci_probe;
 
 /* FMB */
 int zpci_fmb_enable_device(struct zpci_dev *);
diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c
index 60e0372545d2..aa74409db656 100644
--- a/arch/s390/pci/pci.c
+++ b/arch/s390/pci/pci.c
@@ -1072,13 +1072,13 @@ static void zpci_mem_exit(void)
         kmem_cache_destroy(zdev_fmb_cache);
 }
 
-unsigned int pci_probe = 1;
-EXPORT_SYMBOL_GPL(pci_probe);
+unsigned int s390_pci_probe = 1;
+EXPORT_SYMBOL_GPL(s390_pci_probe);
 
 char * __init pcibios_setup(char *str)
 {
         if (!strcmp(str, "off")) {
-                pci_probe = 0;
+                s390_pci_probe = 0;
                 return NULL;
         }
         return str;
@@ -1088,7 +1088,7 @@ static int __init pci_base_init(void)
 {
         int rc;
 
-        if (!pci_probe)
+        if (!s390_pci_probe)
                 return 0;
 
         if (!test_facility(2) || !test_facility(69)
diff --git a/drivers/pci/hotplug/s390_pci_hpc.c b/drivers/pci/hotplug/s390_pci_hpc.c
index dee68e0698e1..8fe2a8aa89a1 100644
--- a/drivers/pci/hotplug/s390_pci_hpc.c
+++ b/drivers/pci/hotplug/s390_pci_hpc.c
@@ -231,7 +231,7 @@ static int __init pci_hotplug_s390_init(void)
          * right now.
          */
 
-        if (!pci_probe)
+        if (!s390_pci_probe)
                 return -EOPNOTSUPP;
 
         /* register callbacks for slot handling from arch code */