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

Commit f6320bd3 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

V4L/DVB (3968a): Remove compatibility check for I2C_PEC 



Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 7923dee0

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

+0 −16
Original line number Diff line number Diff line
@@ -399,17 +399,6 @@ static u32 functionality(struct i2c_adapter *adap) 
	return I2C_FUNC_SMBUS_EMUL;

}



#ifndef I2C_PEC

static void inc_use(struct i2c_adapter *adap)

{

	MOD_INC_USE_COUNT;

}



static void dec_use(struct i2c_adapter *adap)

{

	MOD_DEC_USE_COUNT;

}

#endif



static int em28xx_set_tuner(int check_eeprom, struct i2c_client *client)

{
@@ -480,12 +469,7 @@ static struct i2c_algorithm em28xx_algo = { 
};



static struct i2c_adapter em28xx_adap_template = {

#ifdef I2C_PEC

	.owner = THIS_MODULE,

#else

	.inc_use = inc_use,

	.dec_use = dec_use,

#endif

	.class = I2C_CLASS_TV_ANALOG,

	.name = "em28xx",

	.id = I2C_HW_B_EM28XX,

drivers/media/video/tvmixer.c

+0 −8
Original line number Diff line number Diff line
@@ -198,10 +198,6 @@ static int tvmixer_open(struct inode *inode, struct file *file) 


	/* lock bttv in memory while the mixer is in use  */

	file->private_data = mix;

#ifndef I2C_PEC

	if (client->adapter->inc_use)

		client->adapter->inc_use(client->adapter);

#endif

	if (client->adapter->owner)

		try_module_get(client->adapter->owner);

	return 0;
@@ -217,10 +213,6 @@ static int tvmixer_release(struct inode *inode, struct file *file) 
		return -ENODEV;

	}



#ifndef I2C_PEC

	if (client->adapter->dec_use)

		client->adapter->dec_use(client->adapter);

#endif

	if (client->adapter->owner)

		module_put(client->adapter->owner);

	return 0;