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

Commit f87086e3 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

v4l-dvb: remove legacy checks to allow support for kernels < 2.6.10 



Also remove some blank lines that were used to split compat code at -devel
tree.

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent e01117c8

drivers/media/common/ir-functions.c

+0 −1
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ void ir_input_init(struct input_dev *dev, struct ir_input_state *ir, 
	if (ir_codes)

		memcpy(ir->ir_codes, ir_codes, sizeof(ir->ir_codes));





	dev->keycode     = ir->ir_codes;

	dev->keycodesize = sizeof(IR_KEYTAB_TYPE);

	dev->keycodemax  = IR_KEYTAB_SIZE;

drivers/media/dvb/dvb-usb/dvb-usb-i2c.c

+0 −4
Original line number Diff line number Diff line
@@ -20,11 +20,7 @@ int dvb_usb_i2c_init(struct dvb_usb_device *d) 
	}



	strncpy(d->i2c_adap.name, d->desc->name, sizeof(d->i2c_adap.name));

#ifdef I2C_ADAP_CLASS_TV_DIGITAL

	d->i2c_adap.class = I2C_ADAP_CLASS_TV_DIGITAL,

#else

	d->i2c_adap.class = I2C_CLASS_TV_DIGITAL,

#endif

	d->i2c_adap.algo      = d->props.i2c_algo;

	d->i2c_adap.algo_data = NULL;

	d->i2c_adap.dev.parent = &d->udev->dev;

drivers/media/dvb/ttpci/av7110.c

+0 −4
Original line number Diff line number Diff line
@@ -2471,11 +2471,7 @@ static int __devinit av7110_attach(struct saa7146_dev* dev, 
	   get recognized before the main driver is fully loaded */

	saa7146_write(dev, GPIO_CTRL, 0x500000);



#ifdef I2C_ADAP_CLASS_TV_DIGITAL

	av7110->i2c_adap.class = I2C_ADAP_CLASS_TV_DIGITAL;

#else

	av7110->i2c_adap.class = I2C_CLASS_TV_DIGITAL;

#endif

	strlcpy(av7110->i2c_adap.name, pci_ext->ext_priv, sizeof(av7110->i2c_adap.name));



	saa7146_i2c_adapter_prepare(dev, &av7110->i2c_adap, SAA7146_I2C_BUS_BIT_RATE_120); /* 275 kHz */

drivers/media/dvb/ttpci/budget-core.c

+0 −4
Original line number Diff line number Diff line
@@ -497,11 +497,7 @@ int ttpci_budget_init(struct budget *budget, struct saa7146_dev *dev, 
	if (bi->type != BUDGET_FS_ACTIVY)

		saa7146_write(dev, GPIO_CTRL, 0x500000);	/* GPIO 3 = 1 */



#ifdef I2C_ADAP_CLASS_TV_DIGITAL

	budget->i2c_adap.class = I2C_ADAP_CLASS_TV_DIGITAL;

#else

	budget->i2c_adap.class = I2C_CLASS_TV_DIGITAL;

#endif



	strlcpy(budget->i2c_adap.name, budget->card->name, sizeof(budget->i2c_adap.name));

drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c

+0 −4
Original line number Diff line number Diff line
@@ -1693,11 +1693,7 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i 


	i2c_set_adapdata(&ttusb->i2c_adap, ttusb);



#ifdef I2C_ADAP_CLASS_TV_DIGITAL

	ttusb->i2c_adap.class		  = I2C_ADAP_CLASS_TV_DIGITAL;

#else

	ttusb->i2c_adap.class		  = I2C_CLASS_TV_DIGITAL;

#endif

	ttusb->i2c_adap.algo              = &ttusb_dec_algo;

	ttusb->i2c_adap.algo_data         = NULL;

	ttusb->i2c_adap.dev.parent	  = &udev->dev;