diff options
Diffstat (limited to 'drivers/media/video/vpx3220.c')
-rw-r--r-- | drivers/media/video/vpx3220.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c index 476a204dcf90..ed50b912d8a0 100644 --- a/drivers/media/video/vpx3220.c +++ b/drivers/media/video/vpx3220.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #include <linux/videodev2.h> | 27 | #include <linux/videodev2.h> |
28 | #include <media/v4l2-device.h> | 28 | #include <media/v4l2-device.h> |
29 | #include <media/v4l2-chip-ident.h> | 29 | #include <media/v4l2-chip-ident.h> |
30 | #include <media/v4l2-i2c-drv-legacy.h> | 30 | #include <media/v4l2-i2c-drv.h> |
31 | 31 | ||
32 | MODULE_DESCRIPTION("vpx3220a/vpx3216b/vpx3214c video decoder driver"); | 32 | MODULE_DESCRIPTION("vpx3220a/vpx3216b/vpx3214c video decoder driver"); |
33 | MODULE_AUTHOR("Laurent Pinchart"); | 33 | MODULE_AUTHOR("Laurent Pinchart"); |
@@ -37,9 +37,6 @@ static int debug; | |||
37 | module_param(debug, int, 0); | 37 | module_param(debug, int, 0); |
38 | MODULE_PARM_DESC(debug, "Debug level (0-1)"); | 38 | MODULE_PARM_DESC(debug, "Debug level (0-1)"); |
39 | 39 | ||
40 | static unsigned short normal_i2c[] = { 0x86 >> 1, 0x8e >> 1, I2C_CLIENT_END }; | ||
41 | |||
42 | I2C_CLIENT_INSMOD; | ||
43 | 40 | ||
44 | #define VPX_TIMEOUT_COUNT 10 | 41 | #define VPX_TIMEOUT_COUNT 10 |
45 | 42 | ||
@@ -511,11 +508,6 @@ static int vpx3220_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ide | |||
511 | return v4l2_chip_ident_i2c_client(client, chip, decoder->ident, 0); | 508 | return v4l2_chip_ident_i2c_client(client, chip, decoder->ident, 0); |
512 | } | 509 | } |
513 | 510 | ||
514 | static int vpx3220_command(struct i2c_client *client, unsigned cmd, void *arg) | ||
515 | { | ||
516 | return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg); | ||
517 | } | ||
518 | |||
519 | /* ----------------------------------------------------------------------- */ | 511 | /* ----------------------------------------------------------------------- */ |
520 | 512 | ||
521 | static const struct v4l2_subdev_core_ops vpx3220_core_ops = { | 513 | static const struct v4l2_subdev_core_ops vpx3220_core_ops = { |
@@ -626,8 +618,6 @@ MODULE_DEVICE_TABLE(i2c, vpx3220_id); | |||
626 | 618 | ||
627 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { | 619 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { |
628 | .name = "vpx3220", | 620 | .name = "vpx3220", |
629 | .driverid = I2C_DRIVERID_VPX3220, | ||
630 | .command = vpx3220_command, | ||
631 | .probe = vpx3220_probe, | 621 | .probe = vpx3220_probe, |
632 | .remove = vpx3220_remove, | 622 | .remove = vpx3220_remove, |
633 | .id_table = vpx3220_id, | 623 | .id_table = vpx3220_id, |