Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1500ba0 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarHeiner Kallweit <hkallweit1@gmail.com>
parent 94c17334

drivers/media/rc/rc-core-priv.h

+0 −7
Original line number Diff line number Diff line
@@ -167,11 +167,4 @@ void ir_raw_init(void); 
 * 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 */

drivers/media/rc/rc-ir-raw.c

+0 −10
Original line number Diff line number Diff line
@@ -360,13 +360,3 @@ void ir_raw_handler_unregister(struct ir_raw_handler *ir_raw_handler) 
	mutex_unlock(&ir_raw_handler_lock);

}

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

	 */

}

drivers/media/rc/rc-main.c

+1 −3
Original line number Diff line number Diff line
@@ -1471,10 +1471,8 @@ int rc_register_device(struct rc_dev *dev) 
	kfree(path);



	if (dev->driver_type == RC_DRIVER_IR_RAW) {

		/* Load raw decoders, if they aren't already */

		if (!raw_init) {

			IR_dprintk(1, "Loading raw decoders\n");

			ir_raw_init();

			request_module_nowait("ir-lirc-codec");

			raw_init = true;

		}

		/* calls ir_register_device so unlock mutex here*/