Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07b65340 authored by Randy Dunlap's avatar Randy Dunlap Committed by Greg Kroah-Hartman
Browse files

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


[ Upstream commit 4785603bd05b0b029c647080937674d9991600f9 ]

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.org


Signed-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>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5435e482

drivers/rapidio/devices/tsi721.c

+2 −2
Original line number Diff line number Diff line
@@ -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

drivers/rapidio/devices/tsi721.h

+2 −2
Original line number Diff line number Diff line
@@ -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