aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/adv7170.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-02-19 15:41:19 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 11:42:59 -0400
commit2d26698e859994d4febb2d27b055bdc37d8e368e (patch)
tree86c241c67fc785dffc96cbe2c409a3636a99bca0 /drivers/media/video/adv7170.c
parent7f6adeaf2d8800b66c5dd6c2cf2622dfdd68bd31 (diff)
V4L/DVB (10731): zoran i2c modules: remove i2c autoprobing support.
Zoran doesn't do autoprobing anymore, so remove support for this from the i2c modules. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/adv7170.c')
-rw-r--r--drivers/media/video/adv7170.c16
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
42MODULE_DESCRIPTION("Analog Devices ADV7170 video encoder driver"); 42MODULE_DESCRIPTION("Analog Devices ADV7170 video encoder driver");
43MODULE_AUTHOR("Maxim Yevtyushkin"); 43MODULE_AUTHOR("Maxim Yevtyushkin");
44MODULE_LICENSE("GPL"); 44MODULE_LICENSE("GPL");
45 45
46static unsigned short normal_i2c[] = {
47 0xd4 >> 1, 0xd6 >> 1, /* adv7170 IDs */
48 0x54 >> 1, 0x56 >> 1, /* adv7171 IDs */
49 I2C_CLIENT_END
50};
51
52I2C_CLIENT_INSMOD;
53 46
54static int debug; 47static int debug;
55module_param(debug, int, 0); 48module_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
274static 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
281static const struct v4l2_subdev_core_ops adv7170_core_ops = { 269static const struct v4l2_subdev_core_ops adv7170_core_ops = {
@@ -348,8 +336,6 @@ MODULE_DEVICE_TABLE(i2c, adv7170_id);
348 336
349static struct v4l2_i2c_driver_data v4l2_i2c_data = { 337static 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,