diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-04-08 19:04:06 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-05-19 12:57:14 -0300 |
| commit | 5fa2989f78a381ccc1cde219f0a3da942d6c1680 (patch) | |
| tree | 59447ef80aba0af86d26f49133b59358a0da8c3a /drivers/media/IR | |
| parent | dab7e3106ddd6cbc3b55301228407b9d17ce7773 (diff) | |
| download | blackbird-obmc-linux-5fa2989f78a381ccc1cde219f0a3da942d6c1680.tar.gz blackbird-obmc-linux-5fa2989f78a381ccc1cde219f0a3da942d6c1680.zip | |
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: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/IR')
| -rw-r--r-- | drivers/media/IR/ir-raw-event.c | 5 | ||||
| -rw-r--r-- | drivers/media/IR/rc-map.c | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/media/IR/ir-raw-event.c b/drivers/media/IR/ir-raw-event.c index 6a4445e5db1a..b49d01256be3 100644 --- a/drivers/media/IR/ir-raw-event.c +++ b/drivers/media/IR/ir-raw-event.c @@ -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) { @@ -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 */ @@ -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) { diff --git a/drivers/media/IR/rc-map.c b/drivers/media/IR/rc-map.c index ff185c054267..1a3f4b123a37 100644 --- a/drivers/media/IR/rc-map.c +++ b/drivers/media/IR/rc-map.c @@ -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; |
