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

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

V4L/DVB (3123a): remove uneeded #if from V4L subsystem 



- some uneeded #if were introduced by a previous patch.
  this patch removes these.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
parent b5b8ab8d

drivers/media/video/bt832.c

+0 −5
Original line number Diff line number Diff line
@@ -183,13 +183,8 @@ static int bt832_attach(struct i2c_adapter *adap, int addr, int kind) 


static int bt832_probe(struct i2c_adapter *adap)

{

#ifdef I2C_CLASS_TV_ANALOG

	if (adap->class & I2C_CLASS_TV_ANALOG)

		return i2c_probe(adap, &addr_data, bt832_attach);

#else

	if (adap->id == I2C_HW_B_BT848)

		return i2c_probe(adap, &addr_data, bt832_attach);

#endif

	return 0;

}

drivers/media/video/bttv-i2c.c

+0 −6
Original line number Diff line number Diff line
@@ -105,9 +105,7 @@ static struct i2c_algo_bit_data bttv_i2c_algo_bit_template = { 


static struct i2c_adapter bttv_i2c_adap_sw_template = {

	.owner             = THIS_MODULE,

#ifdef I2C_CLASS_TV_ANALOG

	.class             = I2C_CLASS_TV_ANALOG,

#endif

	.name              = "bt848",

	.id                = I2C_HW_B_BT848,

	.client_register   = attach_inform,
@@ -276,9 +274,7 @@ static struct i2c_algorithm bttv_algo = { 


static struct i2c_adapter bttv_i2c_adap_hw_template = {

	.owner         = THIS_MODULE,

#ifdef I2C_CLASS_TV_ANALOG

	.class         = I2C_CLASS_TV_ANALOG,

#endif

	.name          = "bt878",

	.id            = I2C_HW_B_BT848 /* FIXME */,

	.algo          = &bttv_algo,
@@ -441,12 +437,10 @@ int __devinit init_bttv_i2c(struct bttv *btv) 
	i2c_set_adapdata(&btv->c.i2c_adap, btv);

	btv->i2c_client.adapter = &btv->c.i2c_adap;



#ifdef I2C_CLASS_TV_ANALOG

	if (bttv_tvcards[btv->c.type].no_video)

		btv->c.i2c_adap.class &= ~I2C_CLASS_TV_ANALOG;

	if (bttv_tvcards[btv->c.type].has_dvb)

		btv->c.i2c_adap.class |= I2C_CLASS_TV_DIGITAL;

#endif



	if (btv->use_i2c_hw) {

		btv->i2c_rc = i2c_add_adapter(&btv->c.i2c_adap);

drivers/media/video/cs53l32a.c

+0 −4
Original line number Diff line number Diff line
@@ -190,11 +190,7 @@ static int cs53l32a_attach(struct i2c_adapter *adapter, int address, int kind) 


static int cs53l32a_probe(struct i2c_adapter *adapter)

{

#ifdef I2C_CLASS_TV_ANALOG

	if (adapter->class & I2C_CLASS_TV_ANALOG)

#else

	if (adapter->id == I2C_HW_B_BT848)

#endif

		return i2c_probe(adapter, &addr_data, cs53l32a_attach);

	return 0;

}

drivers/media/video/cx25840/cx25840-core.c

+0 −4
Original line number Diff line number Diff line
@@ -815,11 +815,7 @@ static int cx25840_detect_client(struct i2c_adapter *adapter, int address, 


static int cx25840_attach_adapter(struct i2c_adapter *adapter)

{

#ifdef I2C_CLASS_TV_ANALOG

	if (adapter->class & I2C_CLASS_TV_ANALOG)

#else

	if (adapter->id == I2C_HW_B_BT848)

#endif

		return i2c_probe(adapter, &addr_data, &cx25840_detect_client);

	return 0;

}

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

+0 −2
Original line number Diff line number Diff line
@@ -486,9 +486,7 @@ static struct i2c_adapter em28xx_adap_template = { 
	.inc_use = inc_use,

	.dec_use = dec_use,

#endif

#ifdef I2C_CLASS_TV_ANALOG

	.class = I2C_CLASS_TV_ANALOG,

#endif

	.name = "em28xx",

	.id = I2C_HW_B_EM28XX,

	.algo = &em28xx_algo,