Commit 6867bd5a authored by Frank Schaefer's avatar Frank Schaefer Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarFrank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 3854b0d8

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

+0 −3
Original line number Diff line number Diff line
@@ -2744,9 +2744,6 @@ static void em28xx_card_setup(struct em28xx *dev) 
	if (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 */

	switch (dev->model) {

	case EM2820_BOARD_HAUPPAUGE_WINTV_USB_2:

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

+3 −3
Original line number Diff line number Diff line
@@ -2250,11 +2250,11 @@ static void em28xx_tuner_setup(struct em28xx *dev) 
				     0, tuner, s_type_addr, &tun_setup);

	}



	if (dev->tda9887_conf) {

	if (dev->board.tda9887_conf) {

		struct v4l2_priv_tun_config tda9887_cfg;



		tda9887_cfg.tuner = TUNER_TDA9887;

		tda9887_cfg.priv = &dev->tda9887_conf;

		tda9887_cfg.priv = &dev->board.tda9887_conf;



		v4l2_device_call_all(v4l2_dev,

				     0, tuner, s_config, &tda9887_cfg);
@@ -2360,7 +2360,7 @@ static int em28xx_v4l2_init(struct em28xx *dev) 
	/* Initialize tuner and camera */



	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)

			v4l2_i2c_new_subdev(&v4l2->v4l2_dev,

drivers/media/usb/em28xx/em28xx.h

+0 −1
Original line number Diff line number Diff line
@@ -634,7 +634,6 @@ struct em28xx { 


	int tuner_type;		/* type of the tuner */

	int tuner_addr;		/* tuner address */

	int tda9887_conf;



	/* i2c i/o */

	struct i2c_adapter i2c_adap[NUM_I2C_BUSES];