diff options
Diffstat (limited to 'drivers/media/video/saa7110.c')
-rw-r--r-- | drivers/media/video/saa7110.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c index ea16e3cf1793..977de63fded0 100644 --- a/drivers/media/video/saa7110.c +++ b/drivers/media/video/saa7110.c | |||
@@ -36,15 +36,12 @@ | |||
36 | #include <linux/videodev2.h> | 36 | #include <linux/videodev2.h> |
37 | #include <media/v4l2-device.h> | 37 | #include <media/v4l2-device.h> |
38 | #include <media/v4l2-chip-ident.h> | 38 | #include <media/v4l2-chip-ident.h> |
39 | #include <media/v4l2-i2c-drv-legacy.h> | 39 | #include <media/v4l2-i2c-drv.h> |
40 | 40 | ||
41 | MODULE_DESCRIPTION("Philips SAA7110 video decoder driver"); | 41 | MODULE_DESCRIPTION("Philips SAA7110 video decoder driver"); |
42 | MODULE_AUTHOR("Pauline Middelink"); | 42 | MODULE_AUTHOR("Pauline Middelink"); |
43 | MODULE_LICENSE("GPL"); | 43 | MODULE_LICENSE("GPL"); |
44 | 44 | ||
45 | static unsigned short normal_i2c[] = { 0x9c >> 1, 0x9e >> 1, I2C_CLIENT_END }; | ||
46 | |||
47 | I2C_CLIENT_INSMOD; | ||
48 | 45 | ||
49 | static int debug; | 46 | static int debug; |
50 | module_param(debug, int, 0); | 47 | module_param(debug, int, 0); |
@@ -410,11 +407,6 @@ static int saa7110_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ide | |||
410 | return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_SAA7110, 0); | 407 | return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_SAA7110, 0); |
411 | } | 408 | } |
412 | 409 | ||
413 | static int saa7110_command(struct i2c_client *client, unsigned cmd, void *arg) | ||
414 | { | ||
415 | return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg); | ||
416 | } | ||
417 | |||
418 | /* ----------------------------------------------------------------------- */ | 410 | /* ----------------------------------------------------------------------- */ |
419 | 411 | ||
420 | static const struct v4l2_subdev_core_ops saa7110_core_ops = { | 412 | static const struct v4l2_subdev_core_ops saa7110_core_ops = { |
@@ -518,8 +510,6 @@ MODULE_DEVICE_TABLE(i2c, saa7110_id); | |||
518 | 510 | ||
519 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { | 511 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { |
520 | .name = "saa7110", | 512 | .name = "saa7110", |
521 | .driverid = I2C_DRIVERID_SAA7110, | ||
522 | .command = saa7110_command, | ||
523 | .probe = saa7110_probe, | 513 | .probe = saa7110_probe, |
524 | .remove = saa7110_remove, | 514 | .remove = saa7110_remove, |
525 | .id_table = saa7110_id, | 515 | .id_table = saa7110_id, |