Skip to content

Commit

Permalink
V4L/DVB: ir-core: Remove warining noise if decoders compiled builtin
Browse files Browse the repository at this point in the history
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: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Mauro Carvalho Chehab committed May 19, 2010
1 parent dab7e31 commit 5fa2989
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
5 changes: 4 additions & 1 deletion drivers/media/IR/ir-raw-event.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,10 @@ static DEFINE_SPINLOCK(ir_raw_handler_lock);
_sumrc; \
})


#ifdef MODULE
/* Used to load the decoders */
static struct work_struct wq_load;
#endif

static void ir_raw_event_work(struct work_struct *work)
{
Expand Down Expand Up @@ -218,6 +219,7 @@ void ir_raw_handler_unregister(struct ir_raw_handler *ir_raw_handler)
}
EXPORT_SYMBOL(ir_raw_handler_unregister);

#ifdef MODULE
static void init_decoders(struct work_struct *work)
{
/* Load the decoder modules */
Expand All @@ -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
*/
}
#endif

void ir_raw_init(void)
{
Expand Down
3 changes: 1 addition & 2 deletions drivers/media/IR/rc-map.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,13 @@ static struct rc_keymap *seek_rc_map(const char *name)

struct ir_scancode_table *get_rc_map(const char *name)
{
int rc = 0;

struct rc_keymap *map;

map = seek_rc_map(name);
#ifdef MODULE
if (!map) {
rc = request_module(name);
int rc = request_module(name);
if (rc < 0) {
printk(KERN_ERR "Couldn't load IR keymap %s\n", name);
return NULL;
Expand Down

0 comments on commit 5fa2989

Please sign in to comment.