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>
diff --git a/drivers/media/video/indycam.c b/drivers/media/video/indycam.c
index eb5078c..3d69401 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_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 @@
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 @@
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 @@
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,
};