diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-03-29 22:32:35 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2009-03-29 22:32:35 +0200 |
| commit | 20f6e4bc070bb70c5bf336281b7a80d531bfc3f8 (patch) | |
| tree | e0596e0943748022ee4fb595100effbe856adf44 /linux/drivers/media | |
| parent | 6126d94ddc3aa2d314338c11109c97a1be4b22f0 (diff) | |
| download | mediapointer-dvb-s2-20f6e4bc070bb70c5bf336281b7a80d531bfc3f8.tar.gz mediapointer-dvb-s2-20f6e4bc070bb70c5bf336281b7a80d531bfc3f8.tar.bz2 | |
saa7115: remove i2c legacy code
From: Hans Verkuil <hverkuil@xs4all.nl>
All drivers that use saa7115 now use v4l2_subdev, so we can remove the
legacy code from saa7115.
Priority: normal
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/video/saa7115.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/linux/drivers/media/video/saa7115.c b/linux/drivers/media/video/saa7115.c index 0719b5f13..448d51b58 100644 --- a/linux/drivers/media/video/saa7115.c +++ b/linux/drivers/media/video/saa7115.c @@ -46,7 +46,7 @@ #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 <media/saa7115.h> #include <asm/div64.h> #include "compat.h" @@ -63,12 +63,14 @@ module_param(debug, bool, 0644); MODULE_PARM_DESC(debug, "Debug level (0-1)"); +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22) static unsigned short normal_i2c[] = { 0x4a >> 1, 0x48 >> 1, /* SAA7111, SAA7111A and SAA7113 */ 0x42 >> 1, 0x40 >> 1, /* SAA7114, SAA7115 and SAA7118 */ I2C_CLIENT_END }; I2C_CLIENT_INSMOD; +#endif struct saa711x_state { struct v4l2_subdev sd; @@ -1499,11 +1501,6 @@ static int saa711x_log_status(struct v4l2_subdev *sd) return 0; } -static int saa711x_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 saa711x_core_ops = { @@ -1687,8 +1684,6 @@ MODULE_DEVICE_TABLE(i2c, saa7115_id); #endif static struct v4l2_i2c_driver_data v4l2_i2c_data = { .name = "saa7115", - .driverid = I2C_DRIVERID_SAA711X, - .command = saa711x_command, .probe = saa711x_probe, .remove = saa711x_remove, .legacy_class = I2C_CLASS_TV_ANALOG | I2C_CLASS_TV_DIGITAL, |