diff options
Diffstat (limited to 'include/media')
-rw-r--r-- | include/media/v4l2-common.h | 4 | ||||
-rw-r--r-- | include/media/v4l2-i2c-drv-legacy.h | 2 | ||||
-rw-r--r-- | include/media/v4l2-i2c-drv.h | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h index 316a58453134..020d05758bd8 100644 --- a/include/media/v4l2-common.h +++ b/include/media/v4l2-common.h | |||
@@ -107,9 +107,11 @@ int v4l2_chip_match_host(u32 id_type, u32 chip_id); | |||
107 | struct i2c_driver; | 107 | struct i2c_driver; |
108 | struct i2c_adapter; | 108 | struct i2c_adapter; |
109 | struct i2c_client; | 109 | struct i2c_client; |
110 | struct i2c_device_id; | ||
110 | 111 | ||
111 | int v4l2_i2c_attach(struct i2c_adapter *adapter, int address, struct i2c_driver *driver, | 112 | int v4l2_i2c_attach(struct i2c_adapter *adapter, int address, struct i2c_driver *driver, |
112 | const char *name, int (*probe)(struct i2c_client *)); | 113 | const char *name, |
114 | int (*probe)(struct i2c_client *, const struct i2c_device_id *)); | ||
113 | 115 | ||
114 | /* ------------------------------------------------------------------------- */ | 116 | /* ------------------------------------------------------------------------- */ |
115 | 117 | ||
diff --git a/include/media/v4l2-i2c-drv-legacy.h b/include/media/v4l2-i2c-drv-legacy.h index e7645578fc22..347b6f8beb23 100644 --- a/include/media/v4l2-i2c-drv-legacy.h +++ b/include/media/v4l2-i2c-drv-legacy.h | |||
@@ -25,7 +25,7 @@ struct v4l2_i2c_driver_data { | |||
25 | const char * const name; | 25 | const char * const name; |
26 | int driverid; | 26 | int driverid; |
27 | int (*command)(struct i2c_client *client, unsigned int cmd, void *arg); | 27 | int (*command)(struct i2c_client *client, unsigned int cmd, void *arg); |
28 | int (*probe)(struct i2c_client *client); | 28 | int (*probe)(struct i2c_client *client, const struct i2c_device_id *id); |
29 | int (*remove)(struct i2c_client *client); | 29 | int (*remove)(struct i2c_client *client); |
30 | int (*suspend)(struct i2c_client *client, pm_message_t state); | 30 | int (*suspend)(struct i2c_client *client, pm_message_t state); |
31 | int (*resume)(struct i2c_client *client); | 31 | int (*resume)(struct i2c_client *client); |
diff --git a/include/media/v4l2-i2c-drv.h b/include/media/v4l2-i2c-drv.h index 9e4bab276915..7b6f06be7950 100644 --- a/include/media/v4l2-i2c-drv.h +++ b/include/media/v4l2-i2c-drv.h | |||
@@ -30,7 +30,7 @@ struct v4l2_i2c_driver_data { | |||
30 | const char * const name; | 30 | const char * const name; |
31 | int driverid; | 31 | int driverid; |
32 | int (*command)(struct i2c_client *client, unsigned int cmd, void *arg); | 32 | int (*command)(struct i2c_client *client, unsigned int cmd, void *arg); |
33 | int (*probe)(struct i2c_client *client); | 33 | int (*probe)(struct i2c_client *client, const struct i2c_device_id *id); |
34 | int (*remove)(struct i2c_client *client); | 34 | int (*remove)(struct i2c_client *client); |
35 | int (*suspend)(struct i2c_client *client, pm_message_t state); | 35 | int (*suspend)(struct i2c_client *client, pm_message_t state); |
36 | int (*resume)(struct i2c_client *client); | 36 | int (*resume)(struct i2c_client *client); |