On Mon, 13 Oct 2008 10:14:35 -0600
Matthew Wilcox <matthew@xxxxxx> wrote:
> On Mon, Oct 13, 2008 at 08:57:24AM -0700, Kristen Carlson Accardi wrote:
> > @@ -50,7 +50,7 @@ MODULE_AUTHOR(DRIVER_AUTHOR);
> > MODULE_DESCRIPTION(DRIVER_DESC);
> > MODULE_LICENSE("GPL");
> >
> > -module_param(debug, bool, 0644);
> > +module_param(rpaphp_debug, bool, 0644);
> >
> > /**
> > * set_attention_status - set attention LED
>
> I don't think we should change the parameter.
>
> +module_param_named(debug, rpaphp_debug, bool, 0644);
>
Fine by me.
Change debug variable name to one more unique to this
driver.
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@xxxxxxxxx>
---
drivers/pci/hotplug/rpaphp.h | 4 ++--
drivers/pci/hotplug/rpaphp_core.c | 4 ++--
drivers/pci/hotplug/rpaphp_pci.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
Index: linux-2.6.27-git3/drivers/pci/hotplug/rpaphp.h
===================================================================
--- linux-2.6.27-git3.orig/drivers/pci/hotplug/rpaphp.h 2008-07-13 14:51:29.000000000 -0700
+++ linux-2.6.27-git3/drivers/pci/hotplug/rpaphp.h 2008-10-13 08:46:16.000000000 -0700
@@ -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)
Index: linux-2.6.27-git3/drivers/pci/hotplug/rpaphp_core.c
===================================================================
--- linux-2.6.27-git3.orig/drivers/pci/hotplug/rpaphp_core.c 2008-07-13 14:51:29.000000000 -0700
+++ linux-2.6.27-git3/drivers/pci/hotplug/rpaphp_core.c 2008-10-13 09:57:49.000000000 -0700
@@ -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_AUTHOR(DRIVER_AUTHOR);
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
Index: linux-2.6.27-git3/drivers/pci/hotplug/rpaphp_pci.c
===================================================================
--- linux-2.6.27-git3.orig/drivers/pci/hotplug/rpaphp_pci.c 2008-07-13 14:51:29.000000000 -0700
+++ linux-2.6.27-git3/drivers/pci/hotplug/rpaphp_pci.c 2008-10-13 08:47:08.000000000 -0700
@@ -123,7 +123,7 @@ int rpaphp_enable_slot(struct slot *slot
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)
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
