diff options
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/saa6588.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/media/video/saa6588.c b/drivers/media/video/saa6588.c index 2ce758c1ebb1..c25e81af5ce0 100644 --- a/drivers/media/video/saa6588.c +++ b/drivers/media/video/saa6588.c | |||
@@ -34,16 +34,8 @@ | |||
34 | #include <media/rds.h> | 34 | #include <media/rds.h> |
35 | #include <media/v4l2-device.h> | 35 | #include <media/v4l2-device.h> |
36 | #include <media/v4l2-chip-ident.h> | 36 | #include <media/v4l2-chip-ident.h> |
37 | #include <media/v4l2-i2c-drv-legacy.h> | 37 | #include <media/v4l2-i2c-drv.h> |
38 | 38 | ||
39 | /* Addresses to scan */ | ||
40 | static unsigned short normal_i2c[] = { | ||
41 | 0x20 >> 1, | ||
42 | 0x22 >> 1, | ||
43 | I2C_CLIENT_END, | ||
44 | }; | ||
45 | |||
46 | I2C_CLIENT_INSMOD; | ||
47 | 39 | ||
48 | /* insmod options */ | 40 | /* insmod options */ |
49 | static unsigned int debug; | 41 | static unsigned int debug; |
@@ -431,11 +423,6 @@ static int saa6588_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ide | |||
431 | return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_SAA6588, 0); | 423 | return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_SAA6588, 0); |
432 | } | 424 | } |
433 | 425 | ||
434 | static int saa6588_command(struct i2c_client *client, unsigned cmd, void *arg) | ||
435 | { | ||
436 | return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg); | ||
437 | } | ||
438 | |||
439 | /* ----------------------------------------------------------------------- */ | 426 | /* ----------------------------------------------------------------------- */ |
440 | 427 | ||
441 | static const struct v4l2_subdev_core_ops saa6588_core_ops = { | 428 | static const struct v4l2_subdev_core_ops saa6588_core_ops = { |
@@ -511,7 +498,6 @@ MODULE_DEVICE_TABLE(i2c, saa6588_id); | |||
511 | 498 | ||
512 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { | 499 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { |
513 | .name = "saa6588", | 500 | .name = "saa6588", |
514 | .command = saa6588_command, | ||
515 | .probe = saa6588_probe, | 501 | .probe = saa6588_probe, |
516 | .remove = saa6588_remove, | 502 | .remove = saa6588_remove, |
517 | .id_table = saa6588_id, | 503 | .id_table = saa6588_id, |