PCI hotplug: rpaphp: make debug var unique

Change debug variable name to one more unique to this driver. Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

PCI hotplug: rpaphp: make debug var unique
Change debug variable name to one more unique to this driver. Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Kristen Carlson Accardi · Jesse Barnes
1 parent c9bbb4abb6
Showing 3 changed files with 5 additions and 5 deletions Side-by-side Diff
drivers/pci/hotplug/rpaphp.h
drivers/pci/hotplug/rpaphp_core.c
drivers/pci/hotplug/rpaphp_pci.c
@@ -46,10 +46,10 @@
 #define PRESENT         1	/* Card in slot */
  
 #define MY_NAME "rpaphp"
-extern int debug;
+extern int rpaphp_debug;
 #define dbg(format, arg...)					\
 	do {							\
-		if (debug)					\
+		if (rpaphp_debug)					\
 			printk(KERN_DEBUG "%s: " format,	\
 				MY_NAME , ## arg); 		\
 	} while (0)
@@ -37,7 +37,7 @@
 				/* and pci_do_scan_bus */
 #include "rpaphp.h"
  
-int debug;
+int rpaphp_debug;
 LIST_HEAD(rpaphp_slot_head);
  
 #define DRIVER_VERSION	"0.1"
@@ -50,7 +50,7 @@
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL");
  
-module_param(debug, bool, 0644);
+module_param_named(debug, rpaphp_debug, bool, 0644);
  
 /**
  * set_attention_status - set attention LED
@@ -123,7 +123,7 @@
 			slot->state = CONFIGURED;
 		}
  
-		if (debug) {
+		if (rpaphp_debug) {
 			struct pci_dev *dev;
 			dbg("%s: pci_devs of slot[%s]\n", __func__, slot->dn->full_name);
 			list_for_each_entry (dev, &bus->devices, bus_list)
...	...	@@ -46,10 +46,10 @@
46	46	#define PRESENT 1 /* Card in slot */
47	47
48	48	#define MY_NAME "rpaphp"
49		-extern int debug;
	49	+extern int rpaphp_debug;
50	50	#define dbg(format, arg...) \
51	51	do { \
52		- if (debug) \
	52	+ if (rpaphp_debug) \
53	53	printk(KERN_DEBUG "%s: " format, \
54	54	MY_NAME , ## arg); \
55	55	} while (0)
...	...	@@ -37,7 +37,7 @@
37	37	/* and pci_do_scan_bus */
38	38	#include "rpaphp.h"
39	39
40		-int debug;
	40	+int rpaphp_debug;
41	41	LIST_HEAD(rpaphp_slot_head);
42	42
43	43	#define DRIVER_VERSION "0.1"
...	...	@@ -50,7 +50,7 @@
50	50	MODULE_DESCRIPTION(DRIVER_DESC);
51	51	MODULE_LICENSE("GPL");
52	52
53		-module_param(debug, bool, 0644);
	53	+module_param_named(debug, rpaphp_debug, bool, 0644);
54	54
55	55	/**
56	56	* set_attention_status - set attention LED
...	...	@@ -123,7 +123,7 @@
123	123	slot->state = CONFIGURED;
124	124	}
125	125
126		- if (debug) {
	126	+ if (rpaphp_debug) {
127	127	struct pci_dev *dev;
128	128	dbg("%s: pci_devs of slot[%s]\n", __func__, slot->dn->full_name);
129	129	list_for_each_entry (dev, &bus->devices, bus_list)