diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-02-19 21:41:19 +0100 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2009-02-19 21:41:19 +0100 |
| commit | 92b6b4bed8a77876fa7889ee8bcc86798ccc3762 (patch) | |
| tree | aa44aa7c2532883ac94f087fe5d5965271c54381 /linux/drivers/media/video/saa7110.c | |
| parent | 58dfb1e7efa2bd70a814acae3d512733168feb95 (diff) | |
| download | mediapointer-dvb-s2-92b6b4bed8a77876fa7889ee8bcc86798ccc3762.tar.gz mediapointer-dvb-s2-92b6b4bed8a77876fa7889ee8bcc86798ccc3762.tar.bz2 | |
zoran i2c modules: remove i2c autoprobing support.
From: Hans Verkuil <hverkuil@xs4all.nl>
Zoran doesn't do autoprobing anymore, so remove support for this from the
i2c modules.
Priority: normal
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/saa7110.c')
| -rw-r--r-- | linux/drivers/media/video/saa7110.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/linux/drivers/media/video/saa7110.c b/linux/drivers/media/video/saa7110.c index 132ef1812..c417b7007 100644 --- a/linux/drivers/media/video/saa7110.c +++ b/linux/drivers/media/video/saa7110.c @@ -36,16 +36,18 @@ #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> #include "compat.h" MODULE_DESCRIPTION("Philips SAA7110 video decoder driver"); MODULE_AUTHOR("Pauline Middelink"); MODULE_LICENSE("GPL"); +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22) static unsigned short normal_i2c[] = { 0x9c >> 1, 0x9e >> 1, I2C_CLIENT_END }; I2C_CLIENT_INSMOD; +#endif static int debug; module_param(debug, int, 0); @@ -409,11 +411,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 = { @@ -519,8 +516,6 @@ MODULE_DEVICE_TABLE(i2c, saa7110_id); #endif static struct v4l2_i2c_driver_data v4l2_i2c_data = { .name = "saa7110", - .driverid = I2C_DRIVERID_SAA7110, - .command = saa7110_command, .probe = saa7110_probe, .remove = saa7110_remove, #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) |