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

Commit 2fd6f8d1 authored by Ezequiel García's avatar Ezequiel García Committed by Mauro Carvalho Chehab
Browse files

[media] em28xx: Move ir/rc related initialization to em28xx_ir_init() 



Moving this helps isolating em28xx_input and will help
converting it into a separate module.

Signed-off-by: default avatarEzequiel Garcia <elezegarcia@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 37e65dce

drivers/media/video/em28xx/em28xx-cards.c

+0 −10
Original line number Diff line number Diff line
@@ -2849,13 +2849,6 @@ void em28xx_card_setup(struct em28xx *dev) 
		break;

	}



#if defined(CONFIG_MODULES) && defined(MODULE)

	if (dev->board.has_ir_i2c && !disable_ir)

		request_module("ir-kbd-i2c");

#endif

	if (dev->board.has_snapshot_button)

		em28xx_register_snapshot_button(dev);



	if (dev->board.valid == EM28XX_BOARD_NOT_VALIDATED) {

		em28xx_errdev("\n\n");

		em28xx_errdev("The support for this board weren't "
@@ -2972,9 +2965,6 @@ static void flush_request_modules(struct em28xx *dev) 
*/

void em28xx_release_resources(struct em28xx *dev)

{

	if (dev->sbutton_input_dev)

		em28xx_deregister_snapshot_button(dev);



	if (dev->ir)

		em28xx_ir_fini(dev);

drivers/media/video/em28xx/em28xx-i2c.c

+0 −3
Original line number Diff line number Diff line
@@ -553,9 +553,6 @@ int em28xx_i2c_register(struct em28xx *dev) 
	if (i2c_scan)

		em28xx_do_i2c_scan(dev);



	/* Instantiate the IR receiver device, if present */

	em28xx_register_i2c_ir(dev);



	return 0;

}

drivers/media/video/em28xx/em28xx-input.c

+11 −0
Original line number Diff line number Diff line
@@ -448,6 +448,15 @@ int em28xx_ir_init(struct em28xx *dev) 
	if (err)

		goto err_out_stop;



	em28xx_register_i2c_ir(dev);



#if defined(CONFIG_MODULES) && defined(MODULE)

	if (dev->board.has_ir_i2c)

		request_module("ir-kbd-i2c");

#endif

	if (dev->board.has_snapshot_button)

		em28xx_register_snapshot_button(dev);



	return 0;



 err_out_stop:
@@ -462,6 +471,8 @@ int em28xx_ir_fini(struct em28xx *dev) 
{

	struct em28xx_IR *ir = dev->ir;



	em28xx_deregister_snapshot_button(dev);



	/* skip detach on non attached boards */

	if (!ir)

		return 0;