Skip to contentSkip to conversation

media: rc: remove unneeded code

PATCH In review Heiner Kallweit 1 participant 1 message Nov 21, 2015

Subsystems (2)
Media (V4L/DVB) RC-core / lirc framework
lore
Share & tools
lore

Heiner Kallweit

author
#0 lore raw

PATCH 1/2 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 <[email protected]>
---
 drivers/media/rc/rc-core-priv.h |  7 -------
 drivers/media/rc/rc-ir-raw.c    | 10 ----------
 drivers/media/rc/rc-main.c      |  4 +---
 3 files changed, 1 insertion(+), 20 deletions(-)
drivers/media/rc/rc-core-priv.h +0 -7
index 071651a..7359f3d 100644
@@ -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
index c6433e8..c69807f 100644
@@ -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
index 9d05d03..1042fa3 100644
@@ -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*/
Signature · 1 line
2.6.2