Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-08 13:11:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Ezequiel Garcia <elezegarcia@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Ezequiel García 2012-03-26 09:13:32 -03:00 committed by Mauro Carvalho Chehab
parent 37e65dcecc
commit 2fd6f8d153
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/media/video/em28xx/em28xx-cards.c
View File

@ -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);

3
drivers/media/video/em28xx/em28xx-i2c.c
View File

@ -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;
}

11
drivers/media/video/em28xx/em28xx-input.c
View File

@ -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;