diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-02-18 23:23:43 +0100 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2009-02-18 23:23:43 +0100 |
| commit | 662eeaff4dbeccc9958ac8d31e8b50b9fb058b4c (patch) | |
| tree | 5385b141a46aaa0b84659c3ebbcd8a9fa8424522 /linux/drivers/media/video/saa7191.c | |
| parent | e8550a40016b1ca262d0fc9502d8d7d868420849 (diff) | |
| download | mediapointer-dvb-s2-662eeaff4dbeccc9958ac8d31e8b50b9fb058b4c.tar.gz mediapointer-dvb-s2-662eeaff4dbeccc9958ac8d31e8b50b9fb058b4c.tar.bz2 | |
saa7191, indycam: remove compat code.
From: Hans Verkuil <hverkuil@xs4all.nl>
Priority: normal
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/saa7191.c')
| -rw-r--r-- | linux/drivers/media/video/saa7191.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/linux/drivers/media/video/saa7191.c b/linux/drivers/media/video/saa7191.c index 970b99924..9df505e0f 100644 --- a/linux/drivers/media/video/saa7191.c +++ b/linux/drivers/media/video/saa7191.c @@ -23,7 +23,7 @@ #include <linux/i2c.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" #include "saa7191.h" @@ -35,9 +35,11 @@ MODULE_VERSION(SAA7191_MODULE_VERSION); MODULE_AUTHOR("Mikael Nousiainen <tmnousia@cc.hut.fi>"); MODULE_LICENSE("GPL"); +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22) static unsigned short normal_i2c[] = { 0x8a >> 1, 0x8e >> 1, I2C_CLIENT_END }; I2C_CLIENT_INSMOD; +#endif // #define SAA7191_DEBUG @@ -580,11 +582,6 @@ static int saa7191_g_chip_ident(struct v4l2_subdev *sd, return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_SAA7191, 0); } -static int saa7191_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 saa7191_core_ops = { @@ -653,11 +650,6 @@ static int saa7191_remove(struct i2c_client *client) return 0; } -static int saa7191_legacy_probe(struct i2c_adapter *adapter) -{ - return adapter->id == I2C_HW_SGI_VINO; -} - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) static const struct i2c_device_id saa7191_id[] = { { "saa7191", 0 }, @@ -668,11 +660,8 @@ MODULE_DEVICE_TABLE(i2c, saa7191_id); #endif static struct v4l2_i2c_driver_data v4l2_i2c_data = { .name = "saa7191", - .driverid = I2C_DRIVERID_SAA7191, - .command = saa7191_command, .probe = saa7191_probe, .remove = saa7191_remove, - .legacy_probe = saa7191_legacy_probe, #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) .id_table = saa7191_id, #endif |