diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-03-29 14:04:29 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2009-03-29 14:04:29 +0200 |
| commit | adfc39503d204c842da3fd2768ab84d524b7ef31 (patch) | |
| tree | 617cc2ee90c01709a437bd26921aecbebc8a344c /linux/drivers/media | |
| parent | a69ef6ced83ca94674cf71a79f21116066a10562 (diff) | |
| download | mediapointer-dvb-s2-adfc39503d204c842da3fd2768ab84d524b7ef31.tar.gz mediapointer-dvb-s2-adfc39503d204c842da3fd2768ab84d524b7ef31.tar.bz2 | |
tda9875: remove legacy code for old-style i2c API
From: Hans Verkuil <hverkuil@xs4all.nl>
tda9875 is no longer used with the old-style i2c API, so I can remove
the support for that.
Priority: normal
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/video/tda9875.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/linux/drivers/media/video/tda9875.c b/linux/drivers/media/video/tda9875.c index 938bafbbd..0351b13db 100644 --- a/linux/drivers/media/video/tda9875.c +++ b/linux/drivers/media/video/tda9875.c @@ -28,7 +28,7 @@ #include <linux/i2c.h> #include <linux/videodev2.h> #include <media/v4l2-device.h> -#include <media/v4l2-i2c-drv-legacy.h> +#include <media/v4l2-i2c-drv.h> #include <media/i2c-addr.h> #include "compat.h" @@ -36,6 +36,7 @@ static int debug; /* insmod parameter */ module_param(debug, int, S_IRUGO | S_IWUSR); MODULE_LICENSE("GPL"); +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22) /* Addresses to scan */ static unsigned short normal_i2c[] = { I2C_ADDR_TDA9875 >> 1, @@ -43,6 +44,7 @@ static unsigned short normal_i2c[] = { }; I2C_CLIENT_INSMOD; +#endif /* This is a superset of the TDA9875 */ struct tda9875 { @@ -335,11 +337,6 @@ static int tda9875_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc) return -EINVAL; } -static int tda9875_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 tda9875_core_ops = { @@ -418,7 +415,6 @@ MODULE_DEVICE_TABLE(i2c, tda9875_id); #endif static struct v4l2_i2c_driver_data v4l2_i2c_data = { .name = "tda9875", - .command = tda9875_command, .probe = tda9875_probe, .remove = tda9875_remove, #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) |