From a0720d3b7b80163150fde73aa43ba8fcd417b9cb Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Wed, 18 Feb 2009 19:23:43 -0300
Subject: [PATCH] V4L/DVB (10866): saa7191, indycam: remove compat code.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---
drivers/media/video/indycam.c | 18 +-----------------
drivers/media/video/saa7191.c | 18 +-----------------
2 files changed, 2 insertions(+), 34 deletions(-)
diff --git a/drivers/media/video/indycam.c b/drivers/media/video/indycam.c
index eb5078c07a33..3d6940163b12 100644
--- a/drivers/media/video/indycam.c
+++ b/drivers/media/video/indycam.c
@@ -24,7 +24,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 "indycam.h"
@@ -35,9 +35,6 @@ MODULE_VERSION(INDYCAM_MODULE_VERSION);
MODULE_AUTHOR("Mikael Nousiainen <tmnousia@cc.hut.fi>");
MODULE_LICENSE("GPL");
-static unsigned short normal_i2c[] = { 0x56 >> 1, I2C_CLIENT_END };
-
-I2C_CLIENT_INSMOD;
// #define INDYCAM_DEBUG
@@ -297,11 +294,6 @@ static int indycam_g_chip_ident(struct v4l2_subdev *sd,
camera->version);
}
-static int indycam_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 indycam_core_ops = {
@@ -380,11 +372,6 @@ static int indycam_remove(struct i2c_client *client)
return 0;
}
-static int indycam_legacy_probe(struct i2c_adapter *adapter)
-{
- return adapter->id == I2C_HW_SGI_VINO;
-}
-
static const struct i2c_device_id indycam_id[] = {
{ "indycam", 0 },
{ }
@@ -393,10 +380,7 @@ MODULE_DEVICE_TABLE(i2c, indycam_id);
static struct v4l2_i2c_driver_data v4l2_i2c_data = {
.name = "indycam",
- .driverid = I2C_DRIVERID_INDYCAM,
- .command = indycam_command,
.probe = indycam_probe,
.remove = indycam_remove,
- .legacy_probe = indycam_legacy_probe,
.id_table = indycam_id,
};
diff --git a/drivers/media/video/saa7191.c b/drivers/media/video/saa7191.c
index 40ae2787326f..2e6fce5b51fd 100644
--- a/drivers/media/video/saa7191.c
+++ b/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 "saa7191.h"
@@ -34,9 +34,6 @@ MODULE_VERSION(SAA7191_MODULE_VERSION);
MODULE_AUTHOR("Mikael Nousiainen <tmnousia@cc.hut.fi>");
MODULE_LICENSE("GPL");
-static unsigned short normal_i2c[] = { 0x8a >> 1, 0x8e >> 1, I2C_CLIENT_END };
-
-I2C_CLIENT_INSMOD;
// #define SAA7191_DEBUG
@@ -579,11 +576,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 = {
@@ -652,11 +644,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;
-}
-
static const struct i2c_device_id saa7191_id[] = {
{ "saa7191", 0 },
{ }
@@ -665,10 +652,7 @@ MODULE_DEVICE_TABLE(i2c, saa7191_id);
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,
.id_table = saa7191_id,
};
--
GitLab