diff options
Diffstat (limited to 'drivers/media/video/adv7170.c')
-rw-r--r-- | drivers/media/video/adv7170.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c index 7b10487ae818..43fd1d24cdeb 100644 --- a/drivers/media/video/adv7170.c +++ b/drivers/media/video/adv7170.c | |||
@@ -37,19 +37,12 @@ | |||
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("Analog Devices ADV7170 video encoder driver"); | 42 | MODULE_DESCRIPTION("Analog Devices ADV7170 video encoder driver"); |
43 | MODULE_AUTHOR("Maxim Yevtyushkin"); | 43 | MODULE_AUTHOR("Maxim Yevtyushkin"); |
44 | MODULE_LICENSE("GPL"); | 44 | MODULE_LICENSE("GPL"); |
45 | 45 | ||
46 | static unsigned short normal_i2c[] = { | ||
47 | 0xd4 >> 1, 0xd6 >> 1, /* adv7170 IDs */ | ||
48 | 0x54 >> 1, 0x56 >> 1, /* adv7171 IDs */ | ||
49 | I2C_CLIENT_END | ||
50 | }; | ||
51 | |||
52 | I2C_CLIENT_INSMOD; | ||
53 | 46 | ||
54 | static int debug; | 47 | static int debug; |
55 | module_param(debug, int, 0); | 48 | module_param(debug, int, 0); |
@@ -271,11 +264,6 @@ static int adv7170_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ide | |||
271 | return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_ADV7170, 0); | 264 | return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_ADV7170, 0); |
272 | } | 265 | } |
273 | 266 | ||
274 | static int adv7170_command(struct i2c_client *client, unsigned cmd, void *arg) | ||
275 | { | ||
276 | return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg); | ||
277 | } | ||
278 | |||
279 | /* ----------------------------------------------------------------------- */ | 267 | /* ----------------------------------------------------------------------- */ |
280 | 268 | ||
281 | static const struct v4l2_subdev_core_ops adv7170_core_ops = { | 269 | static const struct v4l2_subdev_core_ops adv7170_core_ops = { |
@@ -348,8 +336,6 @@ MODULE_DEVICE_TABLE(i2c, adv7170_id); | |||
348 | 336 | ||
349 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { | 337 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { |
350 | .name = "adv7170", | 338 | .name = "adv7170", |
351 | .driverid = I2C_DRIVERID_ADV7170, | ||
352 | .command = adv7170_command, | ||
353 | .probe = adv7170_probe, | 339 | .probe = adv7170_probe, |
354 | .remove = adv7170_remove, | 340 | .remove = adv7170_remove, |
355 | .id_table = adv7170_id, | 341 | .id_table = adv7170_id, |