redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

[media] s5p_mfc: don't use an external symbol called 'debug'

Browse source 
The 'debug' name is known to cause conflicts with allyesconfig
on several archs. So, localize its name.

>> drivers/built-in.o:(.bss+0xc7ee2c): multiple definition of `debug'
   arch/x86/built-in.o:(.entry.text+0xf78): first defined here
   ld: Warning: size of symbol `debug' changed from 86 in arch/x86/built-in.o to 4 in drivers/built-in.o

While here, fix a wrong file name reference

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Mauro Carvalho Chehab 2014-08-22 06:07:57 -05:00
parent 9842a417d4
commit 139adba64c
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/media/platform/s5p-mfc/s5p_mfc.c
View file

@ -37,8 +37,8 @@
#define S5P_MFC_DEC_NAME "s5p-mfc-dec" #define S5P_MFC_DEC_NAME "s5p-mfc-dec"
#define S5P_MFC_ENC_NAME "s5p-mfc-enc" #define S5P_MFC_ENC_NAME "s5p-mfc-enc"
int debug; int mfc_debug_level;
module_param(debug, int, S_IRUGO | S_IWUSR); module_param_named(debug, mfc_debug_level, int, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(debug, "Debug level - higher value produces more verbose messages"); MODULE_PARM_DESC(debug, "Debug level - higher value produces more verbose messages");
/* Helper functions for interrupt processing */ /* Helper functions for interrupt processing */

6
drivers/media/platform/s5p-mfc/s5p_mfc_debug.h
View file

@ -1,5 +1,5 @@
/* /*
* drivers/media/platform/samsung/mfc5/s5p_mfc_debug.h * drivers/media/platform/s5p-mfc/s5p_mfc_debug.h
* *
* Header file for Samsung MFC (Multi Function Codec - FIMV) driver * Header file for Samsung MFC (Multi Function Codec - FIMV) driver
* This file contains debug macros * This file contains debug macros
@ -18,11 +18,11 @@
#define DEBUG #define DEBUG
#ifdef DEBUG #ifdef DEBUG
extern int debug; extern int mfc_debug_level;
#define mfc_debug(level, fmt, args...) \ #define mfc_debug(level, fmt, args...) \
do { \ do { \
if (debug >= level) \ if (mfc_debug_level >= level) \
printk(KERN_DEBUG "%s:%d: " fmt, \ printk(KERN_DEBUG "%s:%d: " fmt, \
__func__, __LINE__, ##args); \ __func__, __LINE__, ##args); \
} while (0) } while (0)