The patch number 11283 was added via Hans Verkuil <[email protected]>
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 <[email protected]>

------

From: Hans Verkuil  <[email protected]>
saa6588: remove legacy code.


saa6588 is now only used through v4l2_subdev, so we can remove the old legacy
code.

Priority: normal

Signed-off-by: Hans Verkuil <[email protected]>


---

 linux/drivers/media/video/saa6588.c |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff -r c6efdea42ecc -r e8c6538fb37e linux/drivers/media/video/saa6588.c
--- a/linux/drivers/media/video/saa6588.c       Sun Mar 29 11:26:27 2009 +0200
+++ b/linux/drivers/media/video/saa6588.c       Sun Mar 29 11:29:30 2009 +0200
@@ -34,9 +34,10 @@
 #include <media/rds.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"
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22)
 /* Addresses to scan */
 static unsigned short normal_i2c[] = {
        0x20 >> 1,
@@ -45,6 +46,7 @@ static unsigned short normal_i2c[] = {
 };
 
 I2C_CLIENT_INSMOD;
+#endif
 
 /* insmod options */
 static unsigned int debug;
@@ -440,11 +442,6 @@ static int saa6588_g_chip_ident(struct v
        return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_SAA6588, 0);
 }
 
-static int saa6588_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 saa6588_core_ops = {
@@ -526,7 +523,6 @@ MODULE_DEVICE_TABLE(i2c, saa6588_id);
 #endif
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .name = "saa6588",
-       .command = saa6588_command,
        .probe = saa6588_probe,
        .remove = saa6588_remove,
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)


---

Patch is available at: 
http://linuxtv.org/hg/v4l-dvb/rev/e8c6538fb37e32e60a124ff308d3dfaee7bb1122

_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to