diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-04-08 18:04:06 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-05-19 11:57:14 -0400 |
commit | 5fa2989f78a381ccc1cde219f0a3da942d6c1680 (patch) | |
tree | 59447ef80aba0af86d26f49133b59358a0da8c3a /drivers/media/IR | |
parent | dab7e3106ddd6cbc3b55301228407b9d17ce7773 (diff) |
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); | |||
50 | _sumrc; \ | 50 | _sumrc; \ |
51 | }) | 51 | }) |
52 | 52 | ||
53 | 53 | #ifdef MODULE | |
54 | /* Used to load the decoders */ | 54 | /* Used to load the decoders */ |
55 | static struct work_struct wq_load; | 55 | static struct work_struct wq_load; |
56 | #endif | ||
56 | 57 | ||
57 | static void ir_raw_event_work(struct work_struct *work) | 58 | static void ir_raw_event_work(struct work_struct *work) |
58 | { | 59 | { |
@@ -218,6 +219,7 @@ void ir_raw_handler_unregister(struct ir_raw_handler *ir_raw_handler) | |||
218 | } | 219 | } |
219 | EXPORT_SYMBOL(ir_raw_handler_unregister); | 220 | EXPORT_SYMBOL(ir_raw_handler_unregister); |
220 | 221 | ||
222 | #ifdef MODULE | ||
221 | static void init_decoders(struct work_struct *work) | 223 | static void init_decoders(struct work_struct *work) |
222 | { | 224 | { |
223 | /* Load the decoder modules */ | 225 | /* Load the decoder modules */ |
@@ -229,6 +231,7 @@ static void init_decoders(struct work_struct *work) | |||
229 | it is needed to change the CONFIG_MODULE test at ir-core.h | 231 | it is needed to change the CONFIG_MODULE test at ir-core.h |
230 | */ | 232 | */ |
231 | } | 233 | } |
234 | #endif | ||
232 | 235 | ||
233 | void ir_raw_init(void) | 236 | void ir_raw_init(void) |
234 | { | 237 | { |
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) | |||
37 | 37 | ||
38 | struct ir_scancode_table *get_rc_map(const char *name) | 38 | struct ir_scancode_table *get_rc_map(const char *name) |
39 | { | 39 | { |
40 | int rc = 0; | ||
41 | 40 | ||
42 | struct rc_keymap *map; | 41 | struct rc_keymap *map; |
43 | 42 | ||
44 | map = seek_rc_map(name); | 43 | map = seek_rc_map(name); |
45 | #ifdef MODULE | 44 | #ifdef MODULE |
46 | if (!map) { | 45 | if (!map) { |
47 | rc = request_module(name); | 46 | int rc = request_module(name); |
48 | if (rc < 0) { | 47 | if (rc < 0) { |
49 | printk(KERN_ERR "Couldn't load IR keymap %s\n", name); | 48 | printk(KERN_ERR "Couldn't load IR keymap %s\n", name); |
50 | return NULL; | 49 | return NULL; |