Commit 4785603b authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds

drivers/rapidio/devices/tsi721.c: make module parameter variable name unique

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

Link: http://lkml.kernel.org/r/ab527fc5-aa3c-4b07-5d48-eef5de703192@infradead.orgSigned-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Alexandre Bounine <alexandre.bounine@idt.com>
Cc: Jérémy Lefaure <jeremy.lefaure@lse.epita.fr>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ff8c0c53
...@@ -37,8 +37,8 @@ ...@@ -37,8 +37,8 @@
#include "tsi721.h" #include "tsi721.h"
#ifdef DEBUG #ifdef DEBUG
u32 dbg_level; u32 tsi_dbg_level;
module_param(dbg_level, uint, S_IWUSR | S_IRUGO); module_param_named(dbg_level, tsi_dbg_level, uint, S_IWUSR | S_IRUGO);
MODULE_PARM_DESC(dbg_level, "Debugging output level (default 0 = none)"); MODULE_PARM_DESC(dbg_level, "Debugging output level (default 0 = none)");
#endif #endif
......
...@@ -40,11 +40,11 @@ enum { ...@@ -40,11 +40,11 @@ enum {
}; };
#ifdef DEBUG #ifdef DEBUG
extern u32 dbg_level; extern u32 tsi_dbg_level;
#define tsi_debug(level, dev, fmt, arg...) \ #define tsi_debug(level, dev, fmt, arg...) \
do { \ do { \
if (DBG_##level & dbg_level) \ if (DBG_##level & tsi_dbg_level) \
dev_dbg(dev, "%s: " fmt "\n", __func__, ##arg); \ dev_dbg(dev, "%s: " fmt "\n", __func__, ##arg); \
} while (0) } while (0)
#else #else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment