Commit 5fa2989f authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

V4L/DVB: ir-core: Remove warining noise if decoders compiled builtin

drivers/media/IR/ir-raw-event.c:55: warning: ‘wq_load’ defined but not used
drivers/media/IR/ir-raw-event.c:222: warning: ‘init_decoders’ defined but not used
drivers/media/IR/rc-map.c: In function ‘get_rc_map’:
drivers/media/IR/rc-map.c:40: warning: unused variable ‘rc’
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent dab7e310
...@@ -50,9 +50,10 @@ static DEFINE_SPINLOCK(ir_raw_handler_lock); ...@@ -50,9 +50,10 @@ static DEFINE_SPINLOCK(ir_raw_handler_lock);
_sumrc; \ _sumrc; \
}) })
#ifdef MODULE
/* Used to load the decoders */ /* Used to load the decoders */
static struct work_struct wq_load; static struct work_struct wq_load;
#endif
static void ir_raw_event_work(struct work_struct *work) static void ir_raw_event_work(struct work_struct *work)
{ {
...@@ -218,6 +219,7 @@ void ir_raw_handler_unregister(struct ir_raw_handler *ir_raw_handler) ...@@ -218,6 +219,7 @@ void ir_raw_handler_unregister(struct ir_raw_handler *ir_raw_handler)
} }
EXPORT_SYMBOL(ir_raw_handler_unregister); EXPORT_SYMBOL(ir_raw_handler_unregister);
#ifdef MODULE
static void init_decoders(struct work_struct *work) static void init_decoders(struct work_struct *work)
{ {
/* Load the decoder modules */ /* Load the decoder modules */
...@@ -229,6 +231,7 @@ static void init_decoders(struct work_struct *work) ...@@ -229,6 +231,7 @@ static void init_decoders(struct work_struct *work)
it is needed to change the CONFIG_MODULE test at ir-core.h it is needed to change the CONFIG_MODULE test at ir-core.h
*/ */
} }
#endif
void ir_raw_init(void) void ir_raw_init(void)
{ {
......
...@@ -37,14 +37,13 @@ static struct rc_keymap *seek_rc_map(const char *name) ...@@ -37,14 +37,13 @@ static struct rc_keymap *seek_rc_map(const char *name)
struct ir_scancode_table *get_rc_map(const char *name) struct ir_scancode_table *get_rc_map(const char *name)
{ {
int rc = 0;
struct rc_keymap *map; struct rc_keymap *map;
map = seek_rc_map(name); map = seek_rc_map(name);
#ifdef MODULE #ifdef MODULE
if (!map) { if (!map) {
rc = request_module(name); int rc = request_module(name);
if (rc < 0) { if (rc < 0) {
printk(KERN_ERR "Couldn't load IR keymap %s\n", name); printk(KERN_ERR "Couldn't load IR keymap %s\n", name);
return NULL; return NULL;
......
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