aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/rc
diff options
context:
space:
mode:
authorEzequiel GarcĂ­a <elezegarcia@gmail.com>2012-03-15 15:53:49 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-03-19 21:11:04 -0400
commit5da6e984805786c4d96498e1c51e971007dea6dc (patch)
tree68785330cc2b7f1b4fcb305b5728414416aebfe6 /drivers/media/rc
parent593a2ce0ae22188538d27933236a6acab57a0e65 (diff)
[media] rc: Pospone ir raw decoders loading until really needed
This changes rc_core to not load the IR decoders at load time, postponing it to load only if a RC_DRIVER_IR_RAW device is registered via rc_register_device. We use a static boolean variable, to ensure decoders modules are only loaded once. Tested with rc-loopback device only. Signed-off-by: Ezequiel Garcia <elezegarcia@gmail.com> Acked-by: Jarod Wilson <jarod@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/rc')
-rw-r--r--drivers/media/rc/rc-main.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index f6a930b70c69..6e16b09c24a9 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -1029,6 +1029,7 @@ EXPORT_SYMBOL_GPL(rc_free_device);
1029 1029
1030int rc_register_device(struct rc_dev *dev) 1030int rc_register_device(struct rc_dev *dev)
1031{ 1031{
1032 static bool raw_init = false; /* raw decoders loaded? */
1032 static atomic_t devno = ATOMIC_INIT(0); 1033 static atomic_t devno = ATOMIC_INIT(0);
1033 struct rc_map *rc_map; 1034 struct rc_map *rc_map;
1034 const char *path; 1035 const char *path;
@@ -1103,6 +1104,12 @@ int rc_register_device(struct rc_dev *dev)
1103 kfree(path); 1104 kfree(path);
1104 1105
1105 if (dev->driver_type == RC_DRIVER_IR_RAW) { 1106 if (dev->driver_type == RC_DRIVER_IR_RAW) {
1107 /* Load raw decoders, if they aren't already */
1108 if (!raw_init) {
1109 IR_dprintk(1, "Loading raw decoders\n");
1110 ir_raw_init();
1111 raw_init = true;
1112 }
1106 rc = ir_raw_event_register(dev); 1113 rc = ir_raw_event_register(dev);
1107 if (rc < 0) 1114 if (rc < 0)
1108 goto out_input; 1115 goto out_input;
@@ -1176,8 +1183,6 @@ static int __init rc_core_init(void)
1176 return rc; 1183 return rc;
1177 } 1184 }
1178 1185
1179 /* Initialize/load the decoders/keymap code that will be used */
1180 ir_raw_init();
1181 rc_map_register(&empty_map); 1186 rc_map_register(&empty_map);
1182 1187
1183 return 0; 1188 return 0;