TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[media] em28xx: IR RC: move assignment of get_key functions from *_change_protocol() functions to em28xx_ir_init()

Browse Source 
The get_key functions are independent from the selected protocol, so assign
them once only at device initialization.

[mchehab@redhat.com: fix a merge conflict]
Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Frank Schaefer
2012-12-27 19:02:47 -03:00
committed by Mauro Carvalho Chehab
parent 05fe2175cf
commit 6ea887efad
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/media/usb/em28xx/em28xx-input.c
+2 -4
View File
@@ -384,7 +384,6 @@ static int em2860_ir_change_protocol(struct rc_dev *rc_dev, u64 *rc_type)
*rc_type = ir->rc_type; *rc_type = ir->rc_type;
return -EINVAL; return -EINVAL;
} }
ir->get_key = default_polling_getkey;
em28xx_write_reg_bits(dev, EM28XX_R0F_XCLK, dev->board.xclk, em28xx_write_reg_bits(dev, EM28XX_R0F_XCLK, dev->board.xclk,
EM28XX_XCLK_IR_RC5_MODE); EM28XX_XCLK_IR_RC5_MODE);
@@ -420,10 +419,7 @@ static int em2874_ir_change_protocol(struct rc_dev *rc_dev, u64 *rc_type)
*rc_type = ir->rc_type; *rc_type = ir->rc_type;
return -EINVAL; return -EINVAL;
} }
ir->get_key = em2874_polling_getkey;
em28xx_write_regs(dev, EM2874_R50_IR_CONFIG, &ir_config, 1); em28xx_write_regs(dev, EM2874_R50_IR_CONFIG, &ir_config, 1);
em28xx_write_reg_bits(dev, EM28XX_R0F_XCLK, dev->board.xclk, em28xx_write_reg_bits(dev, EM28XX_R0F_XCLK, dev->board.xclk,
EM28XX_XCLK_IR_RC5_MODE); EM28XX_XCLK_IR_RC5_MODE);
@@ -633,10 +629,12 @@ static int em28xx_ir_init(struct em28xx *dev)
case CHIP_ID_EM2860: case CHIP_ID_EM2860:
case CHIP_ID_EM2883: case CHIP_ID_EM2883:
rc->allowed_protos = RC_BIT_RC5 | RC_BIT_NEC; rc->allowed_protos = RC_BIT_RC5 | RC_BIT_NEC;
ir->get_key = default_polling_getkey;
break; break;
case CHIP_ID_EM2884: case CHIP_ID_EM2884:
case CHIP_ID_EM2874: case CHIP_ID_EM2874:
case CHIP_ID_EM28174: case CHIP_ID_EM28174:
ir->get_key = em2874_polling_getkey;
rc->allowed_protos = RC_BIT_RC5 | RC_BIT_NEC | RC_BIT_RC6_0; rc->allowed_protos = RC_BIT_RC5 | RC_BIT_NEC | RC_BIT_RC6_0;
break; break;
default: default: