iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V4L/DVB (11371): v4l2: remove legacy fields in v4l2-i2c-drv.h.

Browse Source 
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 19:40:01 -03:00 committed by Mauro Carvalho Chehab
parent f41737ece4
commit 0c84674353
3 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/saa7115.c
View File

@ -1667,6 +1667,5 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
.name = "saa7115", .name = "saa7115",
.probe = saa711x_probe, .probe = saa711x_probe,
.remove = saa711x_remove, .remove = saa711x_remove,
.legacy_class = I2C_CLASS_TV_ANALOG | I2C_CLASS_TV_DIGITAL,
.id_table = saa7115_id, .id_table = saa7115_id,
}; };

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

@ -1020,7 +1020,7 @@ static void tuner_lookup(struct i2c_adapter *adap,
int mode_mask; int mode_mask;
if (pos->i2c->adapter != adap || if (pos->i2c->adapter != adap ||
pos->i2c->driver->id != I2C_DRIVERID_TUNER) strcmp(pos->i2c->driver->driver.name, "tuner"))
continue; continue;
mode_mask = pos->mode_mask & ~T_STANDBY; mode_mask = pos->mode_mask & ~T_STANDBY;

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

@ -39,14 +39,11 @@
struct v4l2_i2c_driver_data { struct v4l2_i2c_driver_data {
const char * const name; const char * const name;
int driverid;
int (*command)(struct i2c_client *client, unsigned int cmd, void *arg); int (*command)(struct i2c_client *client, unsigned int cmd, void *arg);
int (*probe)(struct i2c_client *client, const struct i2c_device_id *id); int (*probe)(struct i2c_client *client, const struct i2c_device_id *id);
int (*remove)(struct i2c_client *client); int (*remove)(struct i2c_client *client);
int (*suspend)(struct i2c_client *client, pm_message_t state); int (*suspend)(struct i2c_client *client, pm_message_t state);
int (*resume)(struct i2c_client *client); int (*resume)(struct i2c_client *client);
int (*legacy_probe)(struct i2c_adapter *adapter);
int legacy_class;
const struct i2c_device_id *id_table; const struct i2c_device_id *id_table;
}; };
@ -59,7 +56,6 @@ static struct i2c_driver v4l2_i2c_driver;
static int __init v4l2_i2c_drv_init(void) static int __init v4l2_i2c_drv_init(void)
{ {
v4l2_i2c_driver.driver.name = v4l2_i2c_data.name; v4l2_i2c_driver.driver.name = v4l2_i2c_data.name;
v4l2_i2c_driver.id = v4l2_i2c_data.driverid;
v4l2_i2c_driver.command = v4l2_i2c_data.command; v4l2_i2c_driver.command = v4l2_i2c_data.command;
v4l2_i2c_driver.probe = v4l2_i2c_data.probe; v4l2_i2c_driver.probe = v4l2_i2c_data.probe;
v4l2_i2c_driver.remove = v4l2_i2c_data.remove; v4l2_i2c_driver.remove = v4l2_i2c_data.remove;