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

Commit 86184e06 authored by Steven Toth's avatar Steven Toth Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (6172): cx23885: Removing duplicate tuner and demod definitions 



A number of Hauppauge boards share the same tuner and demod
configurations. This patch removes duplicate structures.

Signed-off-by: default avatarSteven Toth <stoth@hauppauge.com>
Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 31bae4a6

drivers/media/video/cx23885/cx23885-dvb.c

+5 −49
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static struct videobuf_queue_ops dvb_qops = { 
	.buf_release  = dvb_buf_release,

};



static struct s5h1409_config hauppauge_hvr1800lp_config = {

static struct s5h1409_config hauppauge_generic_config = {

	.demod_address = 0x32 >> 1,

	.output_mode   = S5H1409_SERIAL_OUTPUT,

	.gpio          = S5H1409_GPIO_OFF,
@@ -88,33 +88,7 @@ static struct s5h1409_config hauppauge_hvr1800lp_config = { 
	.status_mode   = S5H1409_DEMODLOCKING

};



static struct s5h1409_config hauppauge_hvr1800_config = {

	.demod_address = 0x32 >> 1,

	.output_mode   = S5H1409_SERIAL_OUTPUT,

	.gpio          = S5H1409_GPIO_ON,

	.if_freq       = 44000,

	.inversion     = S5H1409_INVERSION_OFF,

	.status_mode   = S5H1409_DEMODLOCKING

};



static struct s5h1409_config hauppauge_hvr1250_config = {

	.demod_address = 0x32 >> 1,

	.output_mode   = S5H1409_SERIAL_OUTPUT,

	.gpio          = S5H1409_GPIO_ON,

	.if_freq       = 44000,

	.inversion     = S5H1409_INVERSION_OFF,

	.status_mode   = S5H1409_DEMODLOCKING

};



static struct mt2131_config hauppauge_hvr1800lp_rev2_tunerconfig = {

	0x61

};



static struct mt2131_config hauppauge_hvr1800_tunerconfig = {

	0x61

};



static struct mt2131_config hauppauge_hvr1250_tunerconfig = {

static struct mt2131_config hauppauge_generic_tunerconfig = {

	0x61

};
@@ -128,33 +102,15 @@ static int dvb_register(struct cx23885_tsport *port) 
	/* init frontend */

	switch (dev->board) {

	case CX23885_BOARD_HAUPPAUGE_HVR1250:

		port->dvb.frontend = dvb_attach(s5h1409_attach,

						&hauppauge_hvr1250_config,

						&dev->i2c_bus[0].i2c_adap);

		if (port->dvb.frontend != NULL) {

			dvb_attach(mt2131_attach, port->dvb.frontend,

				   &dev->i2c_bus[0].i2c_adap,

				   &hauppauge_hvr1250_tunerconfig, 0);

		}

		break;

	case CX23885_BOARD_HAUPPAUGE_HVR1800lp:

		port->dvb.frontend = dvb_attach(s5h1409_attach,

						&hauppauge_hvr1800lp_config,

						&dev->i2c_bus[0].i2c_adap);

		if (port->dvb.frontend != NULL) {

			dvb_attach(mt2131_attach, port->dvb.frontend,

				   &dev->i2c_bus[0].i2c_adap,

				   &hauppauge_hvr1800lp_rev2_tunerconfig, 0);

		}

		break;

	case CX23885_BOARD_HAUPPAUGE_HVR1800:

	case CX23885_BOARD_HAUPPAUGE_HVR1800lp:

		port->dvb.frontend = dvb_attach(s5h1409_attach,

						&hauppauge_hvr1800_config,

						&hauppauge_generic_config,

						&dev->i2c_bus[0].i2c_adap);

		if (port->dvb.frontend != NULL) {

			dvb_attach(mt2131_attach, port->dvb.frontend,

				   &dev->i2c_bus[0].i2c_adap,

				   &hauppauge_hvr1800_tunerconfig, 0);

				   &hauppauge_generic_tunerconfig, 0);

		}

		break;

	default: