From: Randy Dunlap <rdun...@infradead.org>
kbuild test robot reported a non-static variable name collision between
a staging driver and a RapidIO driver, with a generic variable name of
'dbg_level'.
Both drivers should be changed so that they don't use this generic
public variable name. This patch fixes the RapidIO driver but does not
change the user interface (name) for the module parameter.
drivers/staging/built-in.o:(.bss+0x109d0): multiple definition of `dbg_level'
drivers/rapidio/built-in.o:(.bss+0x16c): first defined here
Signed-off-by: Randy Dunlap <rdun...@infradead.org>
Reported-by: kbuild test robot <fengguang...@intel.com>
Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
Cc: Matt Porter <mpor...@kernel.crashing.org>
Cc: Alexandre Bounine <alexandre.boun...@idt.com>
---
drivers/rapidio/devices/tsi721.c | 4 ++--
drivers/rapidio/devices/tsi721.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
--- lnx-411-rc2.orig/drivers/rapidio/devices/tsi721.c
+++ lnx-411-rc2/drivers/rapidio/devices/tsi721.c
@@ -37,8 +37,8 @@
#include "tsi721.h"
#ifdef DEBUG
-u32 dbg_level;
-module_param(dbg_level, uint, S_IWUSR | S_IRUGO);
+u32 tsi_dbg_level;
+module_param_named(dbg_level, tsi_dbg_level, uint, S_IWUSR | S_IRUGO);
MODULE_PARM_DESC(dbg_level, "Debugging output level (default 0 = none)");
#endif
--- lnx-411-rc2.orig/drivers/rapidio/devices/tsi721.h
+++ lnx-411-rc2/drivers/rapidio/devices/tsi721.h
@@ -40,11 +40,11 @@ enum {
};
#ifdef DEBUG
-extern u32 dbg_level;
+extern u32 tsi_dbg_level;
#define tsi_debug(level, dev, fmt, arg...) \
do { \
- if (DBG_##level & dbg_level) \
+ if (DBG_##level & tsi_dbg_level)
\
dev_dbg(dev, "%s: " fmt "\n", __func__, ##arg); \
} while (0)
#else
