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

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

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>
This commit is contained in:
Hans Verkuil 2009-03-29 20:04:44 -03:00 committed by Mauro Carvalho Chehab
parent 0c84674353
commit acebc70d4a
6 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/media/video/tda9840.c
View File

@ -192,7 +192,6 @@ static int tda9840_remove(struct i2c_client *client)
return 0;
}
static const struct i2c_device_id tda9840_id[] = {
{ "tda9840", 0 },
{ }

1
drivers/media/video/tea6415c.c
View File

@ -170,7 +170,6 @@ static int tea6415c_remove(struct i2c_client *client)
return 0;
}
static const struct i2c_device_id tea6415c_id[] = {
{ "tea6415c", 0 },
{ }

1
drivers/media/video/tea6420.c
View File

@ -156,7 +156,6 @@ static int tea6420_remove(struct i2c_client *client)
return 0;
}
static const struct i2c_device_id tea6420_id[] = {
{ "tea6420", 0 },
{ }

1
drivers/media/video/tuner-core.c
View File

@ -1164,7 +1164,6 @@ static int tuner_probe(struct i2c_client *client,
return 0;
}
static int tuner_remove(struct i2c_client *client)
{
struct tuner *t = to_tuner(i2c_get_clientdata(client));

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

@ -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. */

2
include/media/v4l2-i2c-drv.h
View File

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