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/ks0127.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/ks0127.c')
| -rw-r--r-- | linux/drivers/media/video/ks0127.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/linux/drivers/media/video/ks0127.c b/linux/drivers/media/video/ks0127.c index 309f61ca4..eaa481a57 100644 --- a/linux/drivers/media/video/ks0127.c +++ b/linux/drivers/media/video/ks0127.c @@ -42,7 +42,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 "ks0127.h" #include "compat.h" @@ -50,10 +50,11 @@ MODULE_DESCRIPTION("KS0127 video decoder driver"); MODULE_AUTHOR("Ryan Drake"); MODULE_LICENSE("GPL"); -/* Addresses to scan */ +/* Addresses */ #define I2C_KS0127_ADDON 0xD8 #define I2C_KS0127_ONBOARD 0xDA +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22) static unsigned short normal_i2c[] = { I2C_KS0127_ADDON >> 1, I2C_KS0127_ONBOARD >> 1, @@ -61,6 +62,7 @@ static unsigned short normal_i2c[] = { }; I2C_CLIENT_INSMOD; +#endif /* ks0127 control registers */ #define KS_STAT 0x00 @@ -651,11 +653,6 @@ static int ks0127_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_iden return v4l2_chip_ident_i2c_client(client, chip, ks->ident, 0); } -static int ks0127_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 ks0127_core_ops = { @@ -718,11 +715,6 @@ static int ks0127_remove(struct i2c_client *client) return 0; } -static int ks0127_legacy_probe(struct i2c_adapter *adapter) -{ - return adapter->id == I2C_HW_B_ZR36067; -} - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) static const struct i2c_device_id ks0127_id[] = { { "ks0127", 0 }, @@ -735,11 +727,8 @@ MODULE_DEVICE_TABLE(i2c, ks0127_id); static struct v4l2_i2c_driver_data v4l2_i2c_data = { .name = "ks0127", - .driverid = I2C_DRIVERID_KS0127, - .command = ks0127_command, .probe = ks0127_probe, .remove = ks0127_remove, - .legacy_probe = ks0127_legacy_probe, #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) .id_table = ks0127_id, #endif |