Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[media] media: rc: remove unneeded code

Browse source 
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>
This commit is contained in:
Heiner Kallweit 2015-11-21 12:55:03 -02:00 committed by Mauro Carvalho Chehab
parent 94c1733468
commit c1500ba0b6
3 changed files with 1 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/media/rc/rc-core-priv.h
View file

@ -167,11 +167,4 @@ void ir_raw_init(void);
* loads the compiled decoders for their usage with IR raw events * loads the compiled decoders for their usage with IR raw events
*/ */
/* from ir-lirc-codec.c */
#ifdef CONFIG_IR_LIRC_CODEC_MODULE
#define load_lirc_codec() request_module_nowait("ir-lirc-codec")
#else
static inline void load_lirc_codec(void) { }
#endif
#endif /* _RC_CORE_PRIV */ #endif /* _RC_CORE_PRIV */

10
drivers/media/rc/rc-ir-raw.c
View file

@ -360,13 +360,3 @@ void ir_raw_handler_unregister(struct ir_raw_handler *ir_raw_handler)
mutex_unlock(&ir_raw_handler_lock); mutex_unlock(&ir_raw_handler_lock);
} }
EXPORT_SYMBOL(ir_raw_handler_unregister); EXPORT_SYMBOL(ir_raw_handler_unregister);
void ir_raw_init(void)
{
/* Load the decoder modules */
load_lirc_codec();
/* If needed, we may later add some init code. In this case,
it is needed to change the CONFIG_MODULE test at rc-core.h
*/
}

4
drivers/media/rc/rc-main.c
View file

@ -1471,10 +1471,8 @@ int rc_register_device(struct rc_dev *dev)
kfree(path); kfree(path);
if (dev->driver_type == RC_DRIVER_IR_RAW) { if (dev->driver_type == RC_DRIVER_IR_RAW) {
/* Load raw decoders, if they aren't already */
if (!raw_init) { if (!raw_init) {
IR_dprintk(1, "Loading raw decoders\n"); request_module_nowait("ir-lirc-codec");
ir_raw_init();
raw_init = true; raw_init = true;
} }
/* calls ir_register_device so unlock mutex here*/ /* calls ir_register_device so unlock mutex here*/