The patch number 11371 was added via Hans Verkuil <hverk...@xs4all.nl>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <linux-me...@vger.kernel.org>
------
From: Hans Verkuil <hverk...@xs4all.nl>
v4l2: remove legacy fields in v4l2-i2c-drv.h.
Priority: normal
Signed-off-by: Hans Verkuil <hverk...@xs4all.nl>
---
linux/drivers/media/video/saa7115.c | 2 ++
linux/drivers/media/video/tuner-core.c | 2 +-
linux/include/media/v4l2-i2c-drv.h | 5 ++---
3 files changed, 5 insertions(+), 4 deletions(-)
diff -r 210500b96c30 -r 932180711e51 linux/drivers/media/video/saa7115.c
--- a/linux/drivers/media/video/saa7115.c Wed Apr 01 08:52:39 2009 +0200
+++ b/linux/drivers/media/video/saa7115.c Mon Mar 30 00:40:01 2009 +0200
@@ -1686,7 +1686,9 @@ static struct v4l2_i2c_driver_data v4l2_
.name = "saa7115",
.probe = saa711x_probe,
.remove = saa711x_remove,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22)
.legacy_class = I2C_CLASS_TV_ANALOG | I2C_CLASS_TV_DIGITAL,
+#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
.id_table = saa7115_id,
#endif
diff -r 210500b96c30 -r 932180711e51 linux/drivers/media/video/tuner-core.c
--- a/linux/drivers/media/video/tuner-core.c Wed Apr 01 08:52:39 2009 +0200
+++ b/linux/drivers/media/video/tuner-core.c Mon Mar 30 00:40:01 2009 +0200
@@ -1044,7 +1044,7 @@ static void tuner_lookup(struct i2c_adap
int mode_mask;
if (pos->i2c->adapter != adap ||
- pos->i2c->driver->id != I2C_DRIVERID_TUNER)
+ strcmp(pos->i2c->driver->driver.name, "tuner"))
continue;
mode_mask = pos->mode_mask & ~T_STANDBY;
diff -r 210500b96c30 -r 932180711e51 linux/include/media/v4l2-i2c-drv.h
--- a/linux/include/media/v4l2-i2c-drv.h Wed Apr 01 08:52:39 2009 +0200
+++ b/linux/include/media/v4l2-i2c-drv.h Mon Mar 30 00:40:01 2009 +0200
@@ -39,14 +39,15 @@
struct v4l2_i2c_driver_data {
const char * const name;
- int driverid;
int (*command)(struct i2c_client *client, unsigned int cmd, void *arg);
int (*probe)(struct i2c_client *client, const struct i2c_device_id *id);
int (*remove)(struct i2c_client *client);
int (*suspend)(struct i2c_client *client, pm_message_t state);
int (*resume)(struct i2c_client *client);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22)
int (*legacy_probe)(struct i2c_adapter *adapter);
int legacy_class;
+#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
const struct i2c_device_id *id_table;
#endif
@@ -68,7 +69,6 @@ static int __init v4l2_i2c_drv_init(void
static int __init v4l2_i2c_drv_init(void)
{
v4l2_i2c_driver.driver.name = v4l2_i2c_data.name;
- v4l2_i2c_driver.id = v4l2_i2c_data.driverid;
v4l2_i2c_driver.command = v4l2_i2c_data.command;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
v4l2_i2c_driver.probe = v4l2_i2c_data.probe;
@@ -172,7 +172,6 @@ static int __init v4l2_i2c_drv_init(void
v4l2_i2c_data.legacy_class = I2C_CLASS_TV_ANALOG;
v4l2_i2c_driver.driver.name = v4l2_i2c_data.name;
- v4l2_i2c_driver.id = v4l2_i2c_data.driverid;
v4l2_i2c_driver.command = v4l2_i2c_data.command;
return i2c_add_driver(&v4l2_i2c_driver);
}
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/932180711e51785559523095e11345d6891b2ef8
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
