diff -ura xx-linux-2.6-6-rc3-mm2/drivers/media/video/bt832.c linux-2.6-6-rc3-mm2/drivers/media/video/bt832.c --- xx-linux-2.6-6-rc3-mm2/drivers/media/video/bt832.c 2004-05-09 11:11:10.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/media/video/bt832.c 2004-05-09 14:49:58.000000000 +0200 @@ -197,9 +197,7 @@ static int bt832_probe(struct i2c_adapter *adap) { - if (adap->class & I2C_CLASS_TV_ANALOG) - return i2c_probe(adap, &addr_data, bt832_attach); - return 0; + return i2c_probe(adap, &addr_data, bt832_attach); } static int bt832_detach(struct i2c_client *client) @@ -243,6 +241,7 @@ .name = "i2c bt832 driver", .id = -1, /* FIXME */ .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_TV_ANALOG, .attach_adapter = bt832_probe, .detach_client = bt832_detach, .command = bt832_command, @@ -257,8 +256,7 @@ int bt832_init_module(void) { - i2c_add_driver(&driver); - return 0; + return i2c_add_driver(&driver); } static void bt832_cleanup_module(void) diff -ura xx-linux-2.6-6-rc3-mm2/drivers/media/video/msp3400.c linux-2.6-6-rc3-mm2/drivers/media/video/msp3400.c --- xx-linux-2.6-6-rc3-mm2/drivers/media/video/msp3400.c 2004-05-09 11:11:11.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/media/video/msp3400.c 2004-05-09 14:48:30.000000000 +0200 @@ -1222,6 +1222,7 @@ .name = "i2c msp3400 driver", .id = I2C_DRIVERID_MSP3400, .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_TV_ANALOG, .attach_adapter = msp_probe, .detach_client = msp_detach, .command = msp_command, @@ -1353,19 +1354,7 @@ 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); -#else - switch (adap->id) { - case I2C_ALGO_BIT | I2C_HW_SMBUS_VOODOO3: - case I2C_ALGO_BIT | I2C_HW_B_BT848: - //case I2C_ALGO_SAA7134: - return i2c_probe(adap, &addr_data, msp_attach); - break; - } -#endif - return 0; + return i2c_probe(adap, &addr_data, msp_attach); } static void msp_wake_thread(struct i2c_client *client) @@ -1558,8 +1547,7 @@ static int msp3400_init_module(void) { - i2c_add_driver(&driver); - return 0; + return i2c_add_driver(&driver); } static void msp3400_cleanup_module(void) diff -ura xx-linux-2.6-6-rc3-mm2/drivers/media/video/saa5246a.c linux-2.6-6-rc3-mm2/drivers/media/video/saa5246a.c --- xx-linux-2.6-6-rc3-mm2/drivers/media/video/saa5246a.c 2004-05-09 11:11:11.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/media/video/saa5246a.c 2004-05-09 14:52:53.000000000 +0200 @@ -143,9 +143,7 @@ */ static int saa5246a_probe(struct i2c_adapter *adap) { - if (adap->class & I2C_CLASS_TV_ANALOG) - return i2c_probe(adap, &addr_data, saa5246a_attach); - return 0; + return i2c_probe(adap, &addr_data, saa5246a_attach); } static int saa5246a_detach(struct i2c_client *client) @@ -174,6 +172,7 @@ .name = IF_NAME, /* name */ .id = I2C_DRIVERID_SAA5249, /* in i2c.h */ .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_TV_ANALOG, .attach_adapter = saa5246a_probe, .detach_client = saa5246a_detach, .command = saa5246a_command diff -ura xx-linux-2.6-6-rc3-mm2/drivers/media/video/saa5249.c linux-2.6-6-rc3-mm2/drivers/media/video/saa5249.c --- xx-linux-2.6-6-rc3-mm2/drivers/media/video/saa5249.c 2004-05-09 11:11:11.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/media/video/saa5249.c 2004-05-09 14:50:30.000000000 +0200 @@ -219,9 +219,7 @@ static int saa5249_probe(struct i2c_adapter *adap) { - if (adap->class & I2C_CLASS_TV_ANALOG) - return i2c_probe(adap, &addr_data, saa5249_attach); - return 0; + return i2c_probe(adap, &addr_data, saa5249_attach); } static int saa5249_detach(struct i2c_client *client) @@ -249,6 +247,7 @@ .name = IF_NAME, /* name */ .id = I2C_DRIVERID_SAA5249, /* in i2c.h */ .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_TV_ANALOG, .attach_adapter = saa5249_probe, .detach_client = saa5249_detach, .command = saa5249_command diff -ura xx-linux-2.6-6-rc3-mm2/drivers/media/video/saa7134/saa6752hs.c linux-2.6-6-rc3-mm2/drivers/media/video/saa7134/saa6752hs.c --- xx-linux-2.6-6-rc3-mm2/drivers/media/video/saa7134/saa6752hs.c 2004-05-09 11:11:11.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/media/video/saa7134/saa6752hs.c 2004-05-09 14:47:01.000000000 +0200 @@ -335,9 +335,7 @@ static int saa6752hs_probe(struct i2c_adapter *adap) { - if (adap->class & I2C_CLASS_TV_ANALOG) - return i2c_probe(adap, &addr_data, saa6752hs_attach); - return 0; + return i2c_probe(adap, &addr_data, saa6752hs_attach); } static int saa6752hs_detach(struct i2c_client *client) @@ -376,6 +373,7 @@ .name = "i2c saa6752hs MPEG encoder", .id = I2C_DRIVERID_SAA6752HS, .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_TV_ANALOG, .attach_adapter = saa6752hs_probe, .detach_client = saa6752hs_detach, .command = saa6752hs_command, @@ -390,8 +388,7 @@ static int saa6752hs_init_module(void) { - i2c_add_driver(&driver); - return 0; + return i2c_add_driver(&driver); } static void saa6752hs_cleanup_module(void) diff -ura xx-linux-2.6-6-rc3-mm2/drivers/media/video/tda7432.c linux-2.6-6-rc3-mm2/drivers/media/video/tda7432.c --- xx-linux-2.6-6-rc3-mm2/drivers/media/video/tda7432.c 2004-05-09 11:11:11.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/media/video/tda7432.c 2004-05-09 14:49:17.000000000 +0200 @@ -338,14 +338,7 @@ 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_ALGO_BIT | I2C_HW_B_BT848)) - return i2c_probe(adap, &addr_data, tda7432_attach); -#endif - return 0; + return i2c_probe(adap, &addr_data, tda7432_attach); } static int tda7432_detach(struct i2c_client *client) @@ -520,6 +513,7 @@ .name = "i2c tda7432 driver", .id = I2C_DRIVERID_TDA7432, .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_TV_ANALOG, .attach_adapter = tda7432_probe, .detach_client = tda7432_detach, .command = tda7432_command, @@ -538,8 +532,7 @@ printk(KERN_ERR "tda7432: loudness parameter must be between 0 and 15\n"); return -EINVAL; } - i2c_add_driver(&driver); - return 0; + return i2c_add_driver(&driver); } static void tda7432_fini(void) diff -ura xx-linux-2.6-6-rc3-mm2/drivers/media/video/tda9875.c linux-2.6-6-rc3-mm2/drivers/media/video/tda9875.c --- xx-linux-2.6-6-rc3-mm2/drivers/media/video/tda9875.c 2004-05-09 11:11:11.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/media/video/tda9875.c 2004-05-09 14:48:00.000000000 +0200 @@ -272,14 +272,7 @@ 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_ALGO_BIT | I2C_HW_B_BT848)) - return i2c_probe(adap, &addr_data, tda9875_attach); -#endif - return 0; + return i2c_probe(adap, &addr_data, tda9875_attach); } static int tda9875_detach(struct i2c_client *client) @@ -391,6 +384,7 @@ .name = "i2c tda9875 driver", .id = I2C_DRIVERID_TDA9875, .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_TV_ANALOG, .attach_adapter = tda9875_probe, .detach_client = tda9875_detach, .command = tda9875_command, @@ -405,8 +399,7 @@ static int tda9875_init(void) { - i2c_add_driver(&driver); - return 0; + return i2c_add_driver(&driver); } static void tda9875_fini(void) diff -ura xx-linux-2.6-6-rc3-mm2/drivers/media/video/tda9887.c linux-2.6-6-rc3-mm2/drivers/media/video/tda9887.c --- xx-linux-2.6-6-rc3-mm2/drivers/media/video/tda9887.c 2004-05-09 11:11:11.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/media/video/tda9887.c 2004-05-09 14:46:31.000000000 +0200 @@ -370,19 +370,7 @@ 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_ALGO_BIT | I2C_HW_B_BT848: - case I2C_ALGO_BIT | I2C_HW_B_RIVA: - case I2C_ALGO_SAA7134: - return i2c_probe(adap, &addr_data, tda9887_attach); - break; - } -#endif - return 0; + return i2c_probe(adap, &addr_data, tda9887_attach); } static int tda9887_detach(struct i2c_client *client) @@ -447,6 +435,7 @@ .name = "i2c tda9887 driver", .id = -1, /* FIXME */ .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_TV_ANALOG, .attach_adapter = tda9887_probe, .detach_client = tda9887_detach, .command = tda9887_command, @@ -460,8 +449,7 @@ static int tda9887_init_module(void) { - i2c_add_driver(&driver); - return 0; + return i2c_add_driver(&driver); } static void tda9887_cleanup_module(void) diff -ura xx-linux-2.6-6-rc3-mm2/drivers/media/video/tuner.c linux-2.6-6-rc3-mm2/drivers/media/video/tuner.c --- xx-linux-2.6-6-rc3-mm2/drivers/media/video/tuner.c 2004-05-09 11:11:11.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/media/video/tuner.c 2004-05-09 14:51:10.000000000 +0200 @@ -1067,21 +1067,7 @@ } this_adap = 0; -#ifdef I2C_CLASS_TV_ANALOG - if (adap->class & I2C_CLASS_TV_ANALOG) - return i2c_probe(adap, &addr_data, tuner_attach); -#else - switch (adap->id) { - case I2C_ALGO_BIT | I2C_HW_SMBUS_VOODOO3: - case I2C_ALGO_BIT | I2C_HW_B_BT848: - case I2C_ALGO_BIT | I2C_HW_B_RIVA: - case I2C_ALGO_SAA7134: - case I2C_ALGO_SAA7146: - return i2c_probe(adap, &addr_data, tuner_attach); - break; - } -#endif - return 0; + return i2c_probe(adap, &addr_data, tuner_attach); } static int tuner_detach(struct i2c_client *client) @@ -1184,6 +1170,7 @@ .name = "i2c TV tuner driver", .id = I2C_DRIVERID_TUNER, .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_TV_ANALOG, .attach_adapter = tuner_probe, .detach_client = tuner_detach, .command = tuner_command, @@ -1197,8 +1184,7 @@ static int tuner_init_module(void) { - i2c_add_driver(&driver); - return 0; + return i2c_add_driver(&driver); } static void tuner_cleanup_module(void) diff -ura xx-linux-2.6-6-rc3-mm2/drivers/media/video/tvaudio.c linux-2.6-6-rc3-mm2/drivers/media/video/tvaudio.c --- xx-linux-2.6-6-rc3-mm2/drivers/media/video/tvaudio.c 2004-05-09 11:11:11.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/media/video/tvaudio.c 2004-05-09 14:47:38.000000000 +0200 @@ -1497,18 +1497,7 @@ static int chip_probe(struct i2c_adapter *adap) { -#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_ALGO_BIT | I2C_HW_B_BT848: - case I2C_ALGO_BIT | I2C_HW_B_RIVA: - case I2C_ALGO_SAA7134: - return i2c_probe(adap, &addr_data, chip_attach); - } -#endif - return 0; + return i2c_probe(adap, &addr_data, chip_attach); } static int chip_detach(struct i2c_client *client) @@ -1639,6 +1628,7 @@ .name = "generic i2c audio driver", .id = I2C_DRIVERID_TVAUDIO, .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_TV_ANALOG, .attach_adapter = chip_probe, .detach_client = chip_detach, .command = chip_command, @@ -1659,8 +1649,7 @@ for (desc = chiplist; desc->name != NULL; desc++) printk("%s%s", (desc == chiplist) ? "" : ",",desc->name); printk("\n"); - i2c_add_driver(&driver); - return 0; + return i2c_add_driver(&driver); } static void audiochip_cleanup_module(void) diff -ura xx-linux-2.6-6-rc3-mm2/drivers/media/video/tvmixer.c linux-2.6-6-rc3-mm2/drivers/media/video/tvmixer.c --- xx-linux-2.6-6-rc3-mm2/drivers/media/video/tvmixer.c 2004-05-09 11:11:11.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/media/video/tvmixer.c 2004-05-09 14:52:10.000000000 +0200 @@ -232,6 +232,7 @@ .flags = I2C_DF_NOTIFY, .detach_adapter = tvmixer_adapters, #endif + .class = I2C_CLASS_TV_ANALOG, .attach_adapter = tvmixer_adapters, .detach_client = tvmixer_clients, }; @@ -263,23 +264,6 @@ 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_ALGO_BIT | I2C_HW_SMBUS_VOODOO3: - case I2C_ALGO_BIT | I2C_HW_B_BT848: - case I2C_ALGO_BIT | I2C_HW_B_RIVA: - /* ok, have a look ... */ - break; - default: - /* ignore that one */ - return -1; - } -#endif - /* unregister ?? */ for (i = 0; i < DEV_MAX; i++) { if (devices[i].dev == client) { @@ -334,8 +318,7 @@ for (i = 0; i < DEV_MAX; i++) devices[i].minor = -1; - i2c_add_driver(&driver); - return 0; + return i2c_add_driver(&driver); } static void tvmixer_cleanup_module(void)