diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-02-19 17:41:19 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 12:42:59 -0300 |
| commit | 2d26698e859994d4febb2d27b055bdc37d8e368e (patch) | |
| tree | 86c241c67fc785dffc96cbe2c409a3636a99bca0 /drivers/media/video/saa7110.c | |
| parent | 7f6adeaf2d8800b66c5dd6c2cf2622dfdd68bd31 (diff) | |
| download | linux-3.10-2d26698e859994d4febb2d27b055bdc37d8e368e.tar.gz linux-3.10-2d26698e859994d4febb2d27b055bdc37d8e368e.tar.bz2 linux-3.10-2d26698e859994d4febb2d27b055bdc37d8e368e.zip | |
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/saa7110.c')
| -rw-r--r-- | drivers/media/video/saa7110.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c index ea16e3cf179..977de63fded 100644 --- a/drivers/media/video/saa7110.c +++ b/drivers/media/video/saa7110.c @@ -36,15 +36,12 @@ #include <linux/videodev2.h> #include <media/v4l2-device.h> #include <media/v4l2-chip-ident.h> -#include <media/v4l2-i2c-drv-legacy.h> +#include <media/v4l2-i2c-drv.h> MODULE_DESCRIPTION("Philips SAA7110 video decoder driver"); MODULE_AUTHOR("Pauline Middelink"); MODULE_LICENSE("GPL"); -static unsigned short normal_i2c[] = { 0x9c >> 1, 0x9e >> 1, I2C_CLIENT_END }; - -I2C_CLIENT_INSMOD; static int debug; module_param(debug, int, 0); @@ -410,11 +407,6 @@ static int saa7110_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ide return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_SAA7110, 0); } -static int saa7110_command(struct i2c_client *client, unsigned cmd, void *arg) -{ - return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg); -} - /* ----------------------------------------------------------------------- */ static const struct v4l2_subdev_core_ops saa7110_core_ops = { @@ -518,8 +510,6 @@ MODULE_DEVICE_TABLE(i2c, saa7110_id); static struct v4l2_i2c_driver_data v4l2_i2c_data = { .name = "saa7110", - .driverid = I2C_DRIVERID_SAA7110, - .command = saa7110_command, .probe = saa7110_probe, .remove = saa7110_remove, .id_table = saa7110_id, |