Commit a5a2ecfc authored by Trent Piepho's avatar Trent Piepho Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (5452): Cx88: merge identical boards 



The attach code for HAUPPAUGE_HVR3000 and HAUPPAUGE_HVR1300 is exactly
the same as the code used by HAUPPAUGE_HVR1100, HAUPPAUGE_HVR1100LP, and
WINFAST_DTV2000H.  So, those first two cards are added to the case block
used by the last three.

Signed-off-by: default avatarTrent Piepho <xyzzy@speakeasy.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 59069e53

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

+2 −18
Original line number Diff line number Diff line
@@ -475,6 +475,8 @@ static int dvb_register(struct cx8802_dev *dev) 
	case CX88_BOARD_WINFAST_DTV2000H:

	case CX88_BOARD_HAUPPAUGE_HVR1100:

	case CX88_BOARD_HAUPPAUGE_HVR1100LP:

	case CX88_BOARD_HAUPPAUGE_HVR1300:

	case CX88_BOARD_HAUPPAUGE_HVR3000:

		dev->dvb.frontend = dvb_attach(cx22702_attach,

					       &hauppauge_hvr_config,

					       &dev->core->i2c_adap);
@@ -693,24 +695,6 @@ static int dvb_register(struct cx8802_dev *dev) 
			dev->dvb.frontend->ops.set_voltage = geniatech_dvbs_set_voltage;

		}

		break;

	case CX88_BOARD_HAUPPAUGE_HVR1300:

		dev->dvb.frontend = dvb_attach(cx22702_attach,

					       &hauppauge_hvr_config,

					       &dev->core->i2c_adap);

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

			dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,

				   &dev->core->i2c_adap, &dvb_pll_fmd1216me);

		}

		break;

	case CX88_BOARD_HAUPPAUGE_HVR3000:

		dev->dvb.frontend = dvb_attach(cx22702_attach,

					       &hauppauge_hvr_config,

					       &dev->core->i2c_adap);

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

			dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,

				   &dev->core->i2c_adap, &dvb_pll_fmd1216me);

		}

		break;

	default:

		printk("%s: The frontend of your DVB/ATSC card isn't supported yet\n",

		       dev->core->name);

CRA Git | Maintained and supported by SUSTech CRA and CCSE