diff options
Diffstat (limited to 'drivers/media/video/adv7175.c')
-rw-r--r-- | drivers/media/video/adv7175.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c index 318c3053633a..709e044f007d 100644 --- a/drivers/media/video/adv7175.c +++ b/drivers/media/video/adv7175.c | |||
@@ -33,7 +33,7 @@ | |||
33 | #include <linux/videodev2.h> | 33 | #include <linux/videodev2.h> |
34 | #include <media/v4l2-device.h> | 34 | #include <media/v4l2-device.h> |
35 | #include <media/v4l2-chip-ident.h> | 35 | #include <media/v4l2-chip-ident.h> |
36 | #include <media/v4l2-i2c-drv-legacy.h> | 36 | #include <media/v4l2-i2c-drv.h> |
37 | 37 | ||
38 | MODULE_DESCRIPTION("Analog Devices ADV7175 video encoder driver"); | 38 | MODULE_DESCRIPTION("Analog Devices ADV7175 video encoder driver"); |
39 | MODULE_AUTHOR("Dave Perks"); | 39 | MODULE_AUTHOR("Dave Perks"); |
@@ -42,13 +42,6 @@ MODULE_LICENSE("GPL"); | |||
42 | #define I2C_ADV7175 0xd4 | 42 | #define I2C_ADV7175 0xd4 |
43 | #define I2C_ADV7176 0x54 | 43 | #define I2C_ADV7176 0x54 |
44 | 44 | ||
45 | static unsigned short normal_i2c[] = { | ||
46 | I2C_ADV7175 >> 1, (I2C_ADV7175 >> 1) + 1, | ||
47 | I2C_ADV7176 >> 1, (I2C_ADV7176 >> 1) + 1, | ||
48 | I2C_CLIENT_END | ||
49 | }; | ||
50 | |||
51 | I2C_CLIENT_INSMOD; | ||
52 | 45 | ||
53 | static int debug; | 46 | static int debug; |
54 | module_param(debug, int, 0); | 47 | module_param(debug, int, 0); |
@@ -309,11 +302,6 @@ static int adv7175_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ide | |||
309 | return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_ADV7175, 0); | 302 | return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_ADV7175, 0); |
310 | } | 303 | } |
311 | 304 | ||
312 | static int adv7175_command(struct i2c_client *client, unsigned cmd, void *arg) | ||
313 | { | ||
314 | return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg); | ||
315 | } | ||
316 | |||
317 | /* ----------------------------------------------------------------------- */ | 305 | /* ----------------------------------------------------------------------- */ |
318 | 306 | ||
319 | static const struct v4l2_subdev_core_ops adv7175_core_ops = { | 307 | static const struct v4l2_subdev_core_ops adv7175_core_ops = { |
@@ -387,8 +375,6 @@ MODULE_DEVICE_TABLE(i2c, adv7175_id); | |||
387 | 375 | ||
388 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { | 376 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { |
389 | .name = "adv7175", | 377 | .name = "adv7175", |
390 | .driverid = I2C_DRIVERID_ADV7175, | ||
391 | .command = adv7175_command, | ||
392 | .probe = adv7175_probe, | 378 | .probe = adv7175_probe, |
393 | .remove = adv7175_remove, | 379 | .remove = adv7175_remove, |
394 | .id_table = adv7175_id, | 380 | .id_table = adv7175_id, |