openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] em28xx: remove field tda9887_conf from struct em28xx 

The tda9887 chipset is part of the analog tuner. Move it out of
em28xx-cards.

Also, it is used only one time by the v4l2 sub-module at tuner setup.

With that, we can get rid of an additional data inside the em28xx
common structure.

Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Frank Schaefer 2014-03-24 16:33:23 -03:00 committed by Mauro Carvalho Chehab
parent 3854b0d847
commit 6867bd5aa7
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/media/usb/em28xx/em28xx-cards.c
View File

@ -2744,9 +2744,6 @@ static void em28xx_card_setup(struct em28xx *dev)
if (em28xx_boards[dev->model].tuner_addr) if (em28xx_boards[dev->model].tuner_addr)
dev->tuner_addr = em28xx_boards[dev->model].tuner_addr; dev->tuner_addr = em28xx_boards[dev->model].tuner_addr;
if (em28xx_boards[dev->model].tda9887_conf)
dev->tda9887_conf = em28xx_boards[dev->model].tda9887_conf;
/* request some modules */ /* request some modules */
switch (dev->model) { switch (dev->model) {
case EM2820_BOARD_HAUPPAUGE_WINTV_USB_2: case EM2820_BOARD_HAUPPAUGE_WINTV_USB_2:

6
drivers/media/usb/em28xx/em28xx-video.c
View File

@ -2250,11 +2250,11 @@ static void em28xx_tuner_setup(struct em28xx *dev)
0, tuner, s_type_addr, &tun_setup); 0, tuner, s_type_addr, &tun_setup);
} }
if (dev->tda9887_conf) { if (dev->board.tda9887_conf) {
struct v4l2_priv_tun_config tda9887_cfg; struct v4l2_priv_tun_config tda9887_cfg;
tda9887_cfg.tuner = TUNER_TDA9887; tda9887_cfg.tuner = TUNER_TDA9887;
tda9887_cfg.priv = &dev->tda9887_conf; tda9887_cfg.priv = &dev->board.tda9887_conf;
v4l2_device_call_all(v4l2_dev, v4l2_device_call_all(v4l2_dev,
0, tuner, s_config, &tda9887_cfg); 0, tuner, s_config, &tda9887_cfg);
@ -2360,7 +2360,7 @@ static int em28xx_v4l2_init(struct em28xx *dev)
/* Initialize tuner and camera */ /* Initialize tuner and camera */
if (dev->board.tuner_type != TUNER_ABSENT) { if (dev->board.tuner_type != TUNER_ABSENT) {
int has_demod = (dev->tda9887_conf & TDA9887_PRESENT); int has_demod = (dev->board.tda9887_conf & TDA9887_PRESENT);
if (dev->board.radio.type) if (dev->board.radio.type)
v4l2_i2c_new_subdev(&v4l2->v4l2_dev, v4l2_i2c_new_subdev(&v4l2->v4l2_dev,

1
drivers/media/usb/em28xx/em28xx.h
View File

@ -634,7 +634,6 @@ struct em28xx {
int tuner_type; /* type of the tuner */ int tuner_type; /* type of the tuner */
int tuner_addr; /* tuner address */ int tuner_addr; /* tuner address */
int tda9887_conf;
/* i2c i/o */ /* i2c i/o */
struct i2c_adapter i2c_adap[NUM_I2C_BUSES]; struct i2c_adapter i2c_adap[NUM_I2C_BUSES];