openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
This commit is contained in:
Mauro Carvalho Chehab 2006-01-09 15:25:20 -02:00
parent b5b8ab8d93
commit b060c25f70
16 changed files with 0 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/video/bt832.c
View File

@ -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;
}

6
drivers/media/video/bttv-i2c.c
View File

@ -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);

4
drivers/media/video/cs53l32a.c
View File

@ -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;
}

4
drivers/media/video/cx25840/cx25840-core.c
View File

@ -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;
}

2
drivers/media/video/em28xx/em28xx-i2c.c
View File

@ -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,

4
drivers/media/video/msp3400.c
View File

@ -2336,13 +2336,9 @@ static int msp_detach(struct i2c_client *client)
static int msp_probe(struct i2c_adapter *adap)
{
#ifdef I2C_CLASS_TV_ANALOG
if (adap->class & I2C_CLASS_TV_ANALOG)
return i2c_probe(adap, &addr_data, msp_attach);
return 0;
#else
return i2c_probe(adap, &addr_data, msp_attach);
#endif
}
static int __init msp3400_init_module(void)

10
drivers/media/video/saa6588.c
View File

@ -427,18 +427,8 @@ static int saa6588_attach(struct i2c_adapter *adap, int addr, int kind)
static int saa6588_probe(struct i2c_adapter *adap)
{
#ifdef I2C_CLASS_TV_ANALOG
if (adap->class & I2C_CLASS_TV_ANALOG)
return i2c_probe(adap, &addr_data, saa6588_attach);
#else
switch (adap->id) {
case I2C_HW_B_BT848:
case I2C_HW_B_RIVA:
case I2C_HW_SAA7134:
return i2c_probe(adap, &addr_data, saa6588_attach);
break;
}
#endif
return 0;
}

4
drivers/media/video/saa7115.c
View File

@ -1326,11 +1326,7 @@ static int saa7115_attach(struct i2c_adapter *adapter, int address, int kind)
static int saa7115_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, &saa7115_attach);
return 0;
}

4
drivers/media/video/saa7127.c
View File

@ -787,11 +787,7 @@ static int saa7127_attach(struct i2c_adapter *adapter, int address, int kind)
static int saa7127_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, saa7127_attach);
return 0;
}

2
drivers/media/video/saa7134/saa7134-i2c.c
View File

@ -390,9 +390,7 @@ static struct i2c_algorithm saa7134_algo = {
static struct i2c_adapter saa7134_adap_template = {
.owner = THIS_MODULE,
#ifdef I2C_CLASS_TV_ANALOG
.class = I2C_CLASS_TV_ANALOG,
#endif
.name = "saa7134",
.id = I2C_HW_SAA7134,
.algo = &saa7134_algo,

5
drivers/media/video/tda7432.c
View File

@ -323,13 +323,8 @@ static int tda7432_attach(struct i2c_adapter *adap, int addr, int kind)
static int tda7432_probe(struct i2c_adapter *adap)
{
#ifdef I2C_CLASS_TV_ANALOG
if (adap->class & I2C_CLASS_TV_ANALOG)
return i2c_probe(adap, &addr_data, tda7432_attach);
#else
if (adap->id == I2C_HW_B_BT848)
return i2c_probe(adap, &addr_data, tda7432_attach);
#endif
return 0;
}

5
drivers/media/video/tda9875.c
View File

@ -257,13 +257,8 @@ static int tda9875_attach(struct i2c_adapter *adap, int addr, int kind)
static int tda9875_probe(struct i2c_adapter *adap)
{
#ifdef I2C_CLASS_TV_ANALOG
if (adap->class & I2C_CLASS_TV_ANALOG)
return i2c_probe(adap, &addr_data, tda9875_attach);
#else
if (adap->id == I2C_HW_B_BT848)
return i2c_probe(adap, &addr_data, tda9875_attach);
#endif
return 0;
}

10
drivers/media/video/tda9887.c
View File

@ -714,18 +714,8 @@ static int tda9887_attach(struct i2c_adapter *adap, int addr, int kind)
static int tda9887_probe(struct i2c_adapter *adap)
{
#ifdef I2C_CLASS_TV_ANALOG
if (adap->class & I2C_CLASS_TV_ANALOG)
return i2c_probe(adap, &addr_data, tda9887_attach);
#else
switch (adap->id) {
case I2C_HW_B_BT848:
case I2C_HW_B_RIVA:
case I2C_HW_SAA7134:
return i2c_probe(adap, &addr_data, tda9887_attach);
break;
}
#endif
return 0;
}

9
drivers/media/video/tvaudio.c
View File

@ -1563,17 +1563,8 @@ static int chip_probe(struct i2c_adapter *adap)
because dedicated drivers are used */
if ((adap->id == I2C_HW_SAA7146))
return 0;
#ifdef I2C_CLASS_TV_ANALOG
if (adap->class & I2C_CLASS_TV_ANALOG)
return i2c_probe(adap, &addr_data, chip_attach);
#else
switch (adap->id) {
case I2C_HW_B_BT848:
case I2C_HW_B_RIVA:
case I2C_HW_SAA7134:
return i2c_probe(adap, &addr_data, chip_attach);
}
#endif
return 0;
}

14
drivers/media/video/tvmixer.c
View File

@ -267,22 +267,8 @@ static int tvmixer_clients(struct i2c_client *client)
struct video_audio va;
int i,minor;
#ifdef I2C_CLASS_TV_ANALOG
if (!(client->adapter->class & I2C_CLASS_TV_ANALOG))
return -1;
#else
/* TV card ??? */
switch (client->adapter->id) {
case I2C_HW_SMBUS_VOODOO3:
case I2C_HW_B_BT848:
case I2C_HW_B_RIVA:
/* ok, have a look ... */
break;
default:
/* ignore that one */
return -1;
}
#endif
/* unregister ?? */
for (i = 0; i < DEV_MAX; i++) {

4
drivers/media/video/wm8775.c
View File

@ -206,11 +206,7 @@ static int wm8775_attach(struct i2c_adapter *adapter, int address, int kind)
static int wm8775_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, wm8775_attach);
return 0;
}