diff options
Diffstat (limited to 'drivers/media/video/bt856.c')
-rw-r--r-- | drivers/media/video/bt856.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c index 182da6ab3845..af3c7a885d50 100644 --- a/drivers/media/video/bt856.c +++ b/drivers/media/video/bt856.c | |||
@@ -37,7 +37,7 @@ | |||
37 | #include <linux/videodev2.h> | 37 | #include <linux/videodev2.h> |
38 | #include <media/v4l2-device.h> | 38 | #include <media/v4l2-device.h> |
39 | #include <media/v4l2-chip-ident.h> | 39 | #include <media/v4l2-chip-ident.h> |
40 | #include <media/v4l2-i2c-drv-legacy.h> | 40 | #include <media/v4l2-i2c-drv.h> |
41 | 41 | ||
42 | MODULE_DESCRIPTION("Brooktree-856A video encoder driver"); | 42 | MODULE_DESCRIPTION("Brooktree-856A video encoder driver"); |
43 | MODULE_AUTHOR("Mike Bernson & Dave Perks"); | 43 | MODULE_AUTHOR("Mike Bernson & Dave Perks"); |
@@ -47,9 +47,6 @@ static int debug; | |||
47 | module_param(debug, int, 0); | 47 | module_param(debug, int, 0); |
48 | MODULE_PARM_DESC(debug, "Debug level (0-1)"); | 48 | MODULE_PARM_DESC(debug, "Debug level (0-1)"); |
49 | 49 | ||
50 | static unsigned short normal_i2c[] = { 0x88 >> 1, I2C_CLIENT_END }; | ||
51 | |||
52 | I2C_CLIENT_INSMOD; | ||
53 | 50 | ||
54 | /* ----------------------------------------------------------------------- */ | 51 | /* ----------------------------------------------------------------------- */ |
55 | 52 | ||
@@ -187,11 +184,6 @@ static int bt856_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident | |||
187 | return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_BT856, 0); | 184 | return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_BT856, 0); |
188 | } | 185 | } |
189 | 186 | ||
190 | static int bt856_command(struct i2c_client *client, unsigned cmd, void *arg) | ||
191 | { | ||
192 | return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg); | ||
193 | } | ||
194 | |||
195 | /* ----------------------------------------------------------------------- */ | 187 | /* ----------------------------------------------------------------------- */ |
196 | 188 | ||
197 | static const struct v4l2_subdev_core_ops bt856_core_ops = { | 189 | static const struct v4l2_subdev_core_ops bt856_core_ops = { |
@@ -270,8 +262,6 @@ MODULE_DEVICE_TABLE(i2c, bt856_id); | |||
270 | 262 | ||
271 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { | 263 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { |
272 | .name = "bt856", | 264 | .name = "bt856", |
273 | .driverid = I2C_DRIVERID_BT856, | ||
274 | .command = bt856_command, | ||
275 | .probe = bt856_probe, | 265 | .probe = bt856_probe, |
276 | .remove = bt856_remove, | 266 | .remove = bt856_remove, |
277 | .id_table = bt856_id, | 267 | .id_table = bt856_id, |