V4L/DVB (11372): v4l2: use old-style i2c API for kernels < 2.6.26 instead of < 2...

Originally the intention was to switch to the new style i2c API starting with
the introduction of the API in 2.6.22. However, the i2c_new_probed_device()
function has a lethal bug that wasn't fixed until 2.6.25. Or more accurately,
it was only fixed in the stable series of 2.6.25 and 2.6.26.

Given the fact that the new i2c API also changed starting with 2.6.26 (the
addition of i2c_device_id), it is easiest to switch APIs starting with
2.6.26.

This patch updates all the legacy code accordingly.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/tda9840.c b/drivers/media/video/tda9840.c
index fe1158094c2491c277ec433db8f99de44651ee98..d381fce3db407c6062f73dc4d75162ccb77d5f4a 100644 (file)
--- a/drivers/media/video/tda9840.c
+++ b/drivers/media/video/tda9840.c
@@ -192,7 +192,6 @@ static int tda9840_remove(struct i2c_client *client)
        return 0;
 }
 
-
 static const struct i2c_device_id tda9840_id[] = {
        { "tda9840", 0 },
        { }

diff --git a/drivers/media/video/tea6415c.c b/drivers/media/video/tea6415c.c
index d61c56f42bcd93010e96731147c6dd80ca0026c3..ff696d14a5dd36adf5adeb44e6b6c5d2ebf0b401 100644 (file)
--- a/drivers/media/video/tea6415c.c
+++ b/drivers/media/video/tea6415c.c
@@ -170,7 +170,6 @@ static int tea6415c_remove(struct i2c_client *client)
        return 0;
 }
 
-
 static const struct i2c_device_id tea6415c_id[] = {
        { "tea6415c", 0 },
        { }

diff --git a/drivers/media/video/tea6420.c b/drivers/media/video/tea6420.c
index 34922232402af32e72dc4cc672bd15bd80816605..8a55b46ea9b71c84514a70d9043c884c6a18c331 100644 (file)
--- a/drivers/media/video/tea6420.c
+++ b/drivers/media/video/tea6420.c
@@ -156,7 +156,6 @@ static int tea6420_remove(struct i2c_client *client)
        return 0;
 }
 
-
 static const struct i2c_device_id tea6420_id[] = {
        { "tea6420", 0 },
        { }

diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index cc5f018b8eb4adcf4577eb97f9f165359d22a0e9..78c377a399cb893d1517b4ea6f4a48a6c04d8f19 100644 (file)
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -1164,7 +1164,6 @@ register_client:
        return 0;
 }
 
-
 static int tuner_remove(struct i2c_client *client)
 {
        struct tuner *t = to_tuner(i2c_get_clientdata(client));

diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index 2a49c839f8acf282fb0581b8ee34748cf5b6032a..17d50e3cd5185e83119608b5eca1c298da23f380 100644 (file)
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -2069,7 +2069,6 @@ static int tvaudio_remove(struct i2c_client *client)
        return 0;
 }
 
-
 /* This driver supports many devices and the idea is to let the driver
    detect which device is present. So rather than listing all supported
    devices here, we pretend to support a single, fake device type. */

diff --git a/include/media/v4l2-i2c-drv.h b/include/media/v4l2-i2c-drv.h
index 1ceeb9cfc8a8a35575574470db7889473a3f39fc..10a2882c3cbf295277328a9c3ca62cecee5b1054 100644 (file)
--- a/include/media/v4l2-i2c-drv.h
+++ b/include/media/v4l2-i2c-drv.h
@@ -51,7 +51,7 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data;
 static struct i2c_driver v4l2_i2c_driver;
 
 
-/* Bus-based I2C implementation for kernels >= 2.6.22 */
+/* Bus-based I2C implementation for kernels >= 2.6.26 */
 
 static int __init v4l2_i2c_drv_init(void)
 {