aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/rc/rc-main.c
diff options
context:
space:
mode:
authorHeiner Kallweit <hkallweit1@gmail.com>2015-11-21 09:55:03 -0500
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-12-03 12:01:11 -0500
commitc1500ba0b61e9abf95e0e7ecd3c4ad877f019abe (patch)
tree4b25abb8b81e5c146f9728a05de9df52ea981c7c /drivers/media/rc/rc-main.c
parent94c1733468664255e2431686155114c9b87c25e8 (diff)
[media] media: rc: remove unneeded code
Now that that the decoder modules are loaded on-demand we can move loading the lirc module to rc_register_device directly and remove unneeded functions and comments. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Diffstat (limited to 'drivers/media/rc/rc-main.c')
-rw-r--r--drivers/media/rc/rc-main.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index 9d05d03caa13..1042fa331a07 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -1471,10 +1471,8 @@ int rc_register_device(struct rc_dev *dev)
1471 kfree(path); 1471 kfree(path);
1472 1472
1473 if (dev->driver_type == RC_DRIVER_IR_RAW) { 1473 if (dev->driver_type == RC_DRIVER_IR_RAW) {
1474 /* Load raw decoders, if they aren't already */
1475 if (!raw_init) { 1474 if (!raw_init) {
1476 IR_dprintk(1, "Loading raw decoders\n"); 1475 request_module_nowait("ir-lirc-codec");
1477 ir_raw_init();
1478 raw_init = true; 1476 raw_init = true;
1479 } 1477 }
1480 /* calls ir_register_device so unlock mutex here*/ 1478 /* calls ir_register_device so unlock mutex here*/