diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-02-19 15:41:19 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:42:59 -0400 |
commit | 2d26698e859994d4febb2d27b055bdc37d8e368e (patch) | |
tree | 86c241c67fc785dffc96cbe2c409a3636a99bca0 /drivers/media/video/saa7185.c | |
parent | 7f6adeaf2d8800b66c5dd6c2cf2622dfdd68bd31 (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/saa7185.c')
-rw-r--r-- | drivers/media/video/saa7185.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/media/video/saa7185.c b/drivers/media/video/saa7185.c index b4eb66253bc2..75747b104d07 100644 --- a/drivers/media/video/saa7185.c +++ b/drivers/media/video/saa7185.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("Philips SAA7185 video encoder driver"); | 38 | MODULE_DESCRIPTION("Philips SAA7185 video encoder driver"); |
39 | MODULE_AUTHOR("Dave Perks"); | 39 | MODULE_AUTHOR("Dave Perks"); |
@@ -43,9 +43,6 @@ static int debug; | |||
43 | module_param(debug, int, 0); | 43 | module_param(debug, int, 0); |
44 | MODULE_PARM_DESC(debug, "Debug level (0-1)"); | 44 | MODULE_PARM_DESC(debug, "Debug level (0-1)"); |
45 | 45 | ||
46 | static unsigned short normal_i2c[] = { 0x88 >> 1, I2C_CLIENT_END }; | ||
47 | |||
48 | I2C_CLIENT_INSMOD; | ||
49 | 46 | ||
50 | /* ----------------------------------------------------------------------- */ | 47 | /* ----------------------------------------------------------------------- */ |
51 | 48 | ||
@@ -295,11 +292,6 @@ static int saa7185_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ide | |||
295 | return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_SAA7185, 0); | 292 | return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_SAA7185, 0); |
296 | } | 293 | } |
297 | 294 | ||
298 | static int saa7185_command(struct i2c_client *client, unsigned cmd, void *arg) | ||
299 | { | ||
300 | return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg); | ||
301 | } | ||
302 | |||
303 | /* ----------------------------------------------------------------------- */ | 295 | /* ----------------------------------------------------------------------- */ |
304 | 296 | ||
305 | static const struct v4l2_subdev_core_ops saa7185_core_ops = { | 297 | static const struct v4l2_subdev_core_ops saa7185_core_ops = { |
@@ -374,8 +366,6 @@ MODULE_DEVICE_TABLE(i2c, saa7185_id); | |||
374 | 366 | ||
375 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { | 367 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { |
376 | .name = "saa7185", | 368 | .name = "saa7185", |
377 | .driverid = I2C_DRIVERID_SAA7185B, | ||
378 | .command = saa7185_command, | ||
379 | .probe = saa7185_probe, | 369 | .probe = saa7185_probe, |
380 | .remove = saa7185_remove, | 370 | .remove = saa7185_remove, |
381 | .id_table = saa7185_id, | 371 | .id_table = saa7185_id, |