V4L/DVB (6766): ivtv: remove i2c legacy support from drivers that no longer need it

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/video/m52790.c b/drivers/media/video/m52790.c
index 51ecbfbc1ae7d9a829bf85adecbef1c0ad26bbeb..4d2a52204ad49bf6d12c8eb350273de44be0ca30 100644 (file)
--- a/drivers/media/video/m52790.c
+++ b/drivers/media/video/m52790.c
@@ -36,10 +36,6 @@ MODULE_DESCRIPTION("i2c device driver for m52790 A/V switch");
 MODULE_AUTHOR("Hans Verkuil");
 MODULE_LICENSE("GPL");
 
-static unsigned short normal_i2c[] = { 0x90 >> 1, I2C_CLIENT_END };
-
-
-I2C_CLIENT_INSMOD;
 
 struct m52790_state {
        u16 input;

diff --git a/drivers/media/video/saa7127.c b/drivers/media/video/saa7127.c
index 0262acde0888dcc446ebc39fa2a0b9e7880e9bdb..a5fbfe025333bd5cadae80a98b192d4e0e34444e 100644 (file)
--- a/drivers/media/video/saa7127.c
+++ b/drivers/media/video/saa7127.c
@@ -69,10 +69,6 @@ module_param(test_image, int, 0644);
 MODULE_PARM_DESC(debug, "debug level (0-2)");
 MODULE_PARM_DESC(test_image, "test_image (0-1)");
 
-static unsigned short normal_i2c[] = { 0x88 >> 1, I2C_CLIENT_END };
-
-
-I2C_CLIENT_INSMOD;
 
 /*
  * SAA7127 registers

diff --git a/drivers/media/video/upd64031a.c b/drivers/media/video/upd64031a.c
index 0318432d85f8f51057a094c228e58ea3e49fc62b..1b162f2dca95fab34edc69c239e247d68d280cb9 100644 (file)
--- a/drivers/media/video/upd64031a.c
+++ b/drivers/media/video/upd64031a.c
@@ -49,10 +49,6 @@ module_param(debug, int, 0644);
 
 MODULE_PARM_DESC(debug, "Debug level (0-1)");
 
-static unsigned short normal_i2c[] = { 0x24 >> 1, 0x26 >> 1, I2C_CLIENT_END };
-
-
-I2C_CLIENT_INSMOD;
 
 enum {
        R00 = 0, R01, R02, R03, R04,

diff --git a/drivers/media/video/upd64083.c b/drivers/media/video/upd64083.c
index 7e32c5b0c29d03d12ccf4fc89588d9193b8c3b1c..0f9e86cfc6288216bb964c47dd0062b7e4f692c8 100644 (file)
--- a/drivers/media/video/upd64083.c
+++ b/drivers/media/video/upd64083.c
@@ -39,10 +39,6 @@ module_param(debug, bool, 0644);
 
 MODULE_PARM_DESC(debug, "Debug level (0-1)");
 
-static unsigned short normal_i2c[] = { 0xb8 >> 1, 0xba >> 1, I2C_CLIENT_END };
-
-
-I2C_CLIENT_INSMOD;
 
 enum {
        R00 = 0, R01, R02, R03, R04,

diff --git a/drivers/media/video/vp27smpx.c b/drivers/media/video/vp27smpx.c
index 97e24769e65b22ebb2a84beb3d37c65c77ec2dec..cd98084ac090ddf75c9aaadf450211f7fc17a3ac 100644 (file)
--- a/drivers/media/video/vp27smpx.c
+++ b/drivers/media/video/vp27smpx.c
@@ -36,10 +36,6 @@ MODULE_DESCRIPTION("vp27smpx driver");
 MODULE_AUTHOR("Hans Verkuil");
 MODULE_LICENSE("GPL");
 
-static unsigned short normal_i2c[] = { 0xb6 >> 1, I2C_CLIENT_END };
-
-
-I2C_CLIENT_INSMOD;
 
 /* ----------------------------------------------------------------------- */
 

diff --git a/drivers/media/video/wm8739.c b/drivers/media/video/wm8739.c
index ac4fee1d0251443a510a56e3eb4b8eab538887f3..1c30a5c8455c8c3a35e8ebc6744ae61097175295 100644 (file)
--- a/drivers/media/video/wm8739.c
+++ b/drivers/media/video/wm8739.c
@@ -37,15 +37,12 @@ MODULE_AUTHOR("T. Adachi, Hans Verkuil");
 MODULE_LICENSE("GPL");
 
 static int debug;
-static unsigned short normal_i2c[] = { 0x34 >> 1, 0x36 >> 1, I2C_CLIENT_END };
 
 module_param(debug, int, 0644);
 
 MODULE_PARM_DESC(debug, "Debug level (0-1)");
 
 
-I2C_CLIENT_INSMOD;
-
 /* ------------------------------------------------------------------------ */
 
 enum {

diff --git a/include/media/v4l2-i2c-drv.h b/include/media/v4l2-i2c-drv.h
index bc61ab27779d8843ad2170e6ea1cddf68a50d324..d758b765e0ffb09df870ebcf882d9e60d74f423e 100644 (file)
--- a/include/media/v4l2-i2c-drv.h
+++ b/include/media/v4l2-i2c-drv.h
@@ -34,7 +34,6 @@ struct v4l2_i2c_driver_data {
 };
 
 static struct v4l2_i2c_driver_data v4l2_i2c_data;
-static struct i2c_client_address_data addr_data;
 static struct i2c_driver v4l2_i2c_driver;