aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drivers/media/video/adv7170.c16
-rw-r--r--drivers/media/video/adv7175.c16
-rw-r--r--drivers/media/video/bt819.c12
-rw-r--r--drivers/media/video/bt856.c12
-rw-r--r--drivers/media/video/bt866.c18
-rw-r--r--drivers/media/video/ks0127.c24
-rw-r--r--drivers/media/video/saa7110.c12
-rw-r--r--drivers/media/video/saa7127.c1
-rw-r--r--drivers/media/video/saa7185.c12
-rw-r--r--drivers/media/video/vpx3220.c12
10 files changed, 10 insertions, 125 deletions
diff --git a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c
index 7b10487ae818..43fd1d24cdeb 100644
--- a/drivers/media/video/adv7170.c
+++ b/drivers/media/video/adv7170.c
@@ -37,19 +37,12 @@
37#include <linux/videodev2.h> 37#include <linux/videodev2.h>
38#include <media/v4l2-device.h> 38#include <media/v4l2-device.h>
39#include <media/v4l2-chip-ident.h> 39#include <media/v4l2-chip-ident.h>
40#include <media/v4l2-i2c-drv-legacy.h> 40#include <media/v4l2-i2c-drv.h>
41 41
42MODULE_DESCRIPTION("Analog Devices ADV7170 video encoder driver"); 42MODULE_DESCRIPTION("Analog Devices ADV7170 video encoder driver");
43MODULE_AUTHOR("Maxim Yevtyushkin"); 43MODULE_AUTHOR("Maxim Yevtyushkin");
44MODULE_LICENSE("GPL"); 44MODULE_LICENSE("GPL");
45 45
46static unsigned short normal_i2c[] = {
47 0xd4 >> 1, 0xd6 >> 1, /* adv7170 IDs */
48 0x54 >> 1, 0x56 >> 1, /* adv7171 IDs */
49 I2C_CLIENT_END
50};
51
52I2C_CLIENT_INSMOD;
53 46
54static int debug; 47static int debug;
55module_param(debug, int, 0); 48module_param(debug, int, 0);
@@ -271,11 +264,6 @@ static int adv7170_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ide
271 return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_ADV7170, 0); 264 return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_ADV7170, 0);
272} 265}
273 266
274static int adv7170_command(struct i2c_client *client, unsigned cmd, void *arg)
275{
276 return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
277}
278
279/* ----------------------------------------------------------------------- */ 267/* ----------------------------------------------------------------------- */
280 268
281static const struct v4l2_subdev_core_ops adv7170_core_ops = { 269static const struct v4l2_subdev_core_ops adv7170_core_ops = {
@@ -348,8 +336,6 @@ MODULE_DEVICE_TABLE(i2c, adv7170_id);
348 336
349static struct v4l2_i2c_driver_data v4l2_i2c_data = { 337static struct v4l2_i2c_driver_data v4l2_i2c_data = {
350 .name = "adv7170", 338 .name = "adv7170",
351 .driverid = I2C_DRIVERID_ADV7170,
352 .command = adv7170_command,
353 .probe = adv7170_probe, 339 .probe = adv7170_probe,
354 .remove = adv7170_remove, 340 .remove = adv7170_remove,
355 .id_table = adv7170_id, 341 .id_table = adv7170_id,
diff --git a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c
index 318c3053633a..709e044f007d 100644
--- a/drivers/media/video/adv7175.c
+++ b/drivers/media/video/adv7175.c
@@ -33,7 +33,7 @@
33#include <linux/videodev2.h> 33#include <linux/videodev2.h>
34#include <media/v4l2-device.h> 34#include <media/v4l2-device.h>
35#include <media/v4l2-chip-ident.h> 35#include <media/v4l2-chip-ident.h>
36#include <media/v4l2-i2c-drv-legacy.h> 36#include <media/v4l2-i2c-drv.h>
37 37
38MODULE_DESCRIPTION("Analog Devices ADV7175 video encoder driver"); 38MODULE_DESCRIPTION("Analog Devices ADV7175 video encoder driver");
39MODULE_AUTHOR("Dave Perks"); 39MODULE_AUTHOR("Dave Perks");
@@ -42,13 +42,6 @@ MODULE_LICENSE("GPL");
42#define I2C_ADV7175 0xd4 42#define I2C_ADV7175 0xd4
43#define I2C_ADV7176 0x54 43#define I2C_ADV7176 0x54
44 44
45static unsigned short normal_i2c[] = {
46 I2C_ADV7175 >> 1, (I2C_ADV7175 >> 1) + 1,
47 I2C_ADV7176 >> 1, (I2C_ADV7176 >> 1) + 1,
48 I2C_CLIENT_END
49};
50
51I2C_CLIENT_INSMOD;
52 45
53static int debug; 46static int debug;
54module_param(debug, int, 0); 47module_param(debug, int, 0);
@@ -309,11 +302,6 @@ static int adv7175_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ide
309 return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_ADV7175, 0); 302 return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_ADV7175, 0);
310} 303}
311 304
312static int adv7175_command(struct i2c_client *client, unsigned cmd, void *arg)
313{
314 return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
315}
316
317/* ----------------------------------------------------------------------- */ 305/* ----------------------------------------------------------------------- */
318 306
319static const struct v4l2_subdev_core_ops adv7175_core_ops = { 307static const struct v4l2_subdev_core_ops adv7175_core_ops = {
@@ -387,8 +375,6 @@ MODULE_DEVICE_TABLE(i2c, adv7175_id);
387 375
388static struct v4l2_i2c_driver_data v4l2_i2c_data = { 376static struct v4l2_i2c_driver_data v4l2_i2c_data = {
389 .name = "adv7175", 377 .name = "adv7175",
390 .driverid = I2C_DRIVERID_ADV7175,
391 .command = adv7175_command,
392 .probe = adv7175_probe, 378 .probe = adv7175_probe,
393 .remove = adv7175_remove, 379 .remove = adv7175_remove,
394 .id_table = adv7175_id, 380 .id_table = adv7175_id,
diff --git a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c
index 821af1269293..f2ebf8441aa0 100644
--- a/drivers/media/video/bt819.c
+++ b/drivers/media/video/bt819.c
@@ -38,7 +38,7 @@
38#include <linux/videodev2.h> 38#include <linux/videodev2.h>
39#include <media/v4l2-device.h> 39#include <media/v4l2-device.h>
40#include <media/v4l2-chip-ident.h> 40#include <media/v4l2-chip-ident.h>
41#include <media/v4l2-i2c-drv-legacy.h> 41#include <media/v4l2-i2c-drv.h>
42 42
43MODULE_DESCRIPTION("Brooktree-819 video decoder driver"); 43MODULE_DESCRIPTION("Brooktree-819 video decoder driver");
44MODULE_AUTHOR("Mike Bernson & Dave Perks"); 44MODULE_AUTHOR("Mike Bernson & Dave Perks");
@@ -48,9 +48,6 @@ static int debug;
48module_param(debug, int, 0); 48module_param(debug, int, 0);
49MODULE_PARM_DESC(debug, "Debug level (0-1)"); 49MODULE_PARM_DESC(debug, "Debug level (0-1)");
50 50
51static unsigned short normal_i2c[] = { 0x8a >> 1, I2C_CLIENT_END };
52
53I2C_CLIENT_INSMOD;
54 51
55/* ----------------------------------------------------------------------- */ 52/* ----------------------------------------------------------------------- */
56 53
@@ -428,11 +425,6 @@ static int bt819_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident
428 return v4l2_chip_ident_i2c_client(client, chip, decoder->ident, 0); 425 return v4l2_chip_ident_i2c_client(client, chip, decoder->ident, 0);
429} 426}
430 427
431static int bt819_command(struct i2c_client *client, unsigned cmd, void *arg)
432{
433 return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
434}
435
436/* ----------------------------------------------------------------------- */ 428/* ----------------------------------------------------------------------- */
437 429
438static const struct v4l2_subdev_core_ops bt819_core_ops = { 430static const struct v4l2_subdev_core_ops bt819_core_ops = {
@@ -537,8 +529,6 @@ MODULE_DEVICE_TABLE(i2c, bt819_id);
537 529
538static struct v4l2_i2c_driver_data v4l2_i2c_data = { 530static struct v4l2_i2c_driver_data v4l2_i2c_data = {
539 .name = "bt819", 531 .name = "bt819",
540 .driverid = I2C_DRIVERID_BT819,
541 .command = bt819_command,
542 .probe = bt819_probe, 532 .probe = bt819_probe,
543 .remove = bt819_remove, 533 .remove = bt819_remove,
544 .id_table = bt819_id, 534 .id_table = bt819_id,
diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c
index 182da6ab3845..af3c7a885d50 100644
--- a/drivers/media/video/bt856.c
+++ b/drivers/media/video/bt856.c
@@ -37,7 +37,7 @@
37#include <linux/videodev2.h> 37#include <linux/videodev2.h>
38#include <media/v4l2-device.h> 38#include <media/v4l2-device.h>
39#include <media/v4l2-chip-ident.h> 39#include <media/v4l2-chip-ident.h>
40#include <media/v4l2-i2c-drv-legacy.h> 40#include <media/v4l2-i2c-drv.h>
41 41
42MODULE_DESCRIPTION("Brooktree-856A video encoder driver"); 42MODULE_DESCRIPTION("Brooktree-856A video encoder driver");
43MODULE_AUTHOR("Mike Bernson & Dave Perks"); 43MODULE_AUTHOR("Mike Bernson & Dave Perks");
@@ -47,9 +47,6 @@ static int debug;
47module_param(debug, int, 0); 47module_param(debug, int, 0);
48MODULE_PARM_DESC(debug, "Debug level (0-1)"); 48MODULE_PARM_DESC(debug, "Debug level (0-1)");
49 49
50static unsigned short normal_i2c[] = { 0x88 >> 1, I2C_CLIENT_END };
51
52I2C_CLIENT_INSMOD;
53 50
54/* ----------------------------------------------------------------------- */ 51/* ----------------------------------------------------------------------- */
55 52
@@ -187,11 +184,6 @@ static int bt856_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident
187 return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_BT856, 0); 184 return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_BT856, 0);
188} 185}
189 186
190static int bt856_command(struct i2c_client *client, unsigned cmd, void *arg)
191{
192 return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
193}
194
195/* ----------------------------------------------------------------------- */ 187/* ----------------------------------------------------------------------- */
196 188
197static const struct v4l2_subdev_core_ops bt856_core_ops = { 189static const struct v4l2_subdev_core_ops bt856_core_ops = {
@@ -270,8 +262,6 @@ MODULE_DEVICE_TABLE(i2c, bt856_id);
270 262
271static struct v4l2_i2c_driver_data v4l2_i2c_data = { 263static struct v4l2_i2c_driver_data v4l2_i2c_data = {
272 .name = "bt856", 264 .name = "bt856",
273 .driverid = I2C_DRIVERID_BT856,
274 .command = bt856_command,
275 .probe = bt856_probe, 265 .probe = bt856_probe,
276 .remove = bt856_remove, 266 .remove = bt856_remove,
277 .id_table = bt856_id, 267 .id_table = bt856_id,
diff --git a/drivers/media/video/bt866.c b/drivers/media/video/bt866.c
index 18d383877ece..0a32221fa3f9 100644
--- a/drivers/media/video/bt866.c
+++ b/drivers/media/video/bt866.c
@@ -37,7 +37,7 @@
37#include <linux/videodev2.h> 37#include <linux/videodev2.h>
38#include <media/v4l2-device.h> 38#include <media/v4l2-device.h>
39#include <media/v4l2-chip-ident.h> 39#include <media/v4l2-chip-ident.h>
40#include <media/v4l2-i2c-drv-legacy.h> 40#include <media/v4l2-i2c-drv.h>
41 41
42MODULE_DESCRIPTION("Brooktree-866 video encoder driver"); 42MODULE_DESCRIPTION("Brooktree-866 video encoder driver");
43MODULE_AUTHOR("Mike Bernson & Dave Perks"); 43MODULE_AUTHOR("Mike Bernson & Dave Perks");
@@ -47,9 +47,6 @@ static int debug;
47module_param(debug, int, 0); 47module_param(debug, int, 0);
48MODULE_PARM_DESC(debug, "Debug level (0-1)"); 48MODULE_PARM_DESC(debug, "Debug level (0-1)");
49 49
50static unsigned short normal_i2c[] = { 0x88 >> 1, I2C_CLIENT_END };
51
52I2C_CLIENT_INSMOD;
53 50
54/* ----------------------------------------------------------------------- */ 51/* ----------------------------------------------------------------------- */
55 52
@@ -185,11 +182,6 @@ static int bt866_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident
185 return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_BT866, 0); 182 return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_BT866, 0);
186} 183}
187 184
188static int bt866_command(struct i2c_client *client, unsigned cmd, void *arg)
189{
190 return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
191}
192
193/* ----------------------------------------------------------------------- */ 185/* ----------------------------------------------------------------------- */
194 186
195static const struct v4l2_subdev_core_ops bt866_core_ops = { 187static const struct v4l2_subdev_core_ops bt866_core_ops = {
@@ -232,11 +224,6 @@ static int bt866_remove(struct i2c_client *client)
232 return 0; 224 return 0;
233} 225}
234 226
235static int bt866_legacy_probe(struct i2c_adapter *adapter)
236{
237 return adapter->id == I2C_HW_B_ZR36067;
238}
239
240static const struct i2c_device_id bt866_id[] = { 227static const struct i2c_device_id bt866_id[] = {
241 { "bt866", 0 }, 228 { "bt866", 0 },
242 { } 229 { }
@@ -245,10 +232,7 @@ MODULE_DEVICE_TABLE(i2c, bt866_id);
245 232
246static struct v4l2_i2c_driver_data v4l2_i2c_data = { 233static struct v4l2_i2c_driver_data v4l2_i2c_data = {
247 .name = "bt866", 234 .name = "bt866",
248 .driverid = I2C_DRIVERID_BT866,
249 .command = bt866_command,
250 .probe = bt866_probe, 235 .probe = bt866_probe,
251 .remove = bt866_remove, 236 .remove = bt866_remove,
252 .legacy_probe = bt866_legacy_probe,
253 .id_table = bt866_id, 237 .id_table = bt866_id,
254}; 238};
diff --git a/drivers/media/video/ks0127.c b/drivers/media/video/ks0127.c
index 07c79250f8fd..678c4e23f0e8 100644
--- a/drivers/media/video/ks0127.c
+++ b/drivers/media/video/ks0127.c
@@ -42,24 +42,17 @@
42#include <linux/videodev2.h> 42#include <linux/videodev2.h>
43#include <media/v4l2-device.h> 43#include <media/v4l2-device.h>
44#include <media/v4l2-chip-ident.h> 44#include <media/v4l2-chip-ident.h>
45#include <media/v4l2-i2c-drv-legacy.h> 45#include <media/v4l2-i2c-drv.h>
46#include "ks0127.h" 46#include "ks0127.h"
47 47
48MODULE_DESCRIPTION("KS0127 video decoder driver"); 48MODULE_DESCRIPTION("KS0127 video decoder driver");
49MODULE_AUTHOR("Ryan Drake"); 49MODULE_AUTHOR("Ryan Drake");
50MODULE_LICENSE("GPL"); 50MODULE_LICENSE("GPL");
51 51
52/* Addresses to scan */ 52/* Addresses */
53#define I2C_KS0127_ADDON 0xD8 53#define I2C_KS0127_ADDON 0xD8
54#define I2C_KS0127_ONBOARD 0xDA 54#define I2C_KS0127_ONBOARD 0xDA
55 55
56static unsigned short normal_i2c[] = {
57 I2C_KS0127_ADDON >> 1,
58 I2C_KS0127_ONBOARD >> 1,
59 I2C_CLIENT_END
60};
61
62I2C_CLIENT_INSMOD;
63 56
64/* ks0127 control registers */ 57/* ks0127 control registers */
65#define KS_STAT 0x00 58#define KS_STAT 0x00
@@ -650,11 +643,6 @@ static int ks0127_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_iden
650 return v4l2_chip_ident_i2c_client(client, chip, ks->ident, 0); 643 return v4l2_chip_ident_i2c_client(client, chip, ks->ident, 0);
651} 644}
652 645
653static int ks0127_command(struct i2c_client *client, unsigned cmd, void *arg)
654{
655 return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
656}
657
658/* ----------------------------------------------------------------------- */ 646/* ----------------------------------------------------------------------- */
659 647
660static const struct v4l2_subdev_core_ops ks0127_core_ops = { 648static const struct v4l2_subdev_core_ops ks0127_core_ops = {
@@ -717,11 +705,6 @@ static int ks0127_remove(struct i2c_client *client)
717 return 0; 705 return 0;
718} 706}
719 707
720static int ks0127_legacy_probe(struct i2c_adapter *adapter)
721{
722 return adapter->id == I2C_HW_B_ZR36067;
723}
724
725static const struct i2c_device_id ks0127_id[] = { 708static const struct i2c_device_id ks0127_id[] = {
726 { "ks0127", 0 }, 709 { "ks0127", 0 },
727 { "ks0127b", 0 }, 710 { "ks0127b", 0 },
@@ -732,10 +715,7 @@ MODULE_DEVICE_TABLE(i2c, ks0127_id);
732 715
733static struct v4l2_i2c_driver_data v4l2_i2c_data = { 716static struct v4l2_i2c_driver_data v4l2_i2c_data = {
734 .name = "ks0127", 717 .name = "ks0127",
735 .driverid = I2C_DRIVERID_KS0127,
736 .command = ks0127_command,
737 .probe = ks0127_probe, 718 .probe = ks0127_probe,
738 .remove = ks0127_remove, 719 .remove = ks0127_remove,
739 .legacy_probe = ks0127_legacy_probe,
740 .id_table = ks0127_id, 720 .id_table = ks0127_id,
741}; 721};
diff --git a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c
index ea16e3cf1793..977de63fded0 100644
--- a/drivers/media/video/saa7110.c
+++ b/drivers/media/video/saa7110.c
@@ -36,15 +36,12 @@
36#include <linux/videodev2.h> 36#include <linux/videodev2.h>
37#include <media/v4l2-device.h> 37#include <media/v4l2-device.h>
38#include <media/v4l2-chip-ident.h> 38#include <media/v4l2-chip-ident.h>
39#include <media/v4l2-i2c-drv-legacy.h> 39#include <media/v4l2-i2c-drv.h>
40 40
41MODULE_DESCRIPTION("Philips SAA7110 video decoder driver"); 41MODULE_DESCRIPTION("Philips SAA7110 video decoder driver");
42MODULE_AUTHOR("Pauline Middelink"); 42MODULE_AUTHOR("Pauline Middelink");
43MODULE_LICENSE("GPL"); 43MODULE_LICENSE("GPL");
44 44
45static unsigned short normal_i2c[] = { 0x9c >> 1, 0x9e >> 1, I2C_CLIENT_END };
46
47I2C_CLIENT_INSMOD;
48 45
49static int debug; 46static int debug;
50module_param(debug, int, 0); 47module_param(debug, int, 0);
@@ -410,11 +407,6 @@ static int saa7110_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ide
410 return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_SAA7110, 0); 407 return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_SAA7110, 0);
411} 408}
412 409
413static int saa7110_command(struct i2c_client *client, unsigned cmd, void *arg)
414{
415 return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
416}
417
418/* ----------------------------------------------------------------------- */ 410/* ----------------------------------------------------------------------- */
419 411
420static const struct v4l2_subdev_core_ops saa7110_core_ops = { 412static const struct v4l2_subdev_core_ops saa7110_core_ops = {
@@ -518,8 +510,6 @@ MODULE_DEVICE_TABLE(i2c, saa7110_id);
518 510
519static struct v4l2_i2c_driver_data v4l2_i2c_data = { 511static struct v4l2_i2c_driver_data v4l2_i2c_data = {
520 .name = "saa7110", 512 .name = "saa7110",
521 .driverid = I2C_DRIVERID_SAA7110,
522 .command = saa7110_command,
523 .probe = saa7110_probe, 513 .probe = saa7110_probe,
524 .remove = saa7110_remove, 514 .remove = saa7110_remove,
525 .id_table = saa7110_id, 515 .id_table = saa7110_id,
diff --git a/drivers/media/video/saa7127.c b/drivers/media/video/saa7127.c
index 05221d47dd4c..128bb8b8dbbf 100644
--- a/drivers/media/video/saa7127.c
+++ b/drivers/media/video/saa7127.c
@@ -810,7 +810,6 @@ MODULE_DEVICE_TABLE(i2c, saa7127_id);
810 810
811static struct v4l2_i2c_driver_data v4l2_i2c_data = { 811static struct v4l2_i2c_driver_data v4l2_i2c_data = {
812 .name = "saa7127", 812 .name = "saa7127",
813 .driverid = I2C_DRIVERID_SAA7127,
814 .probe = saa7127_probe, 813 .probe = saa7127_probe,
815 .remove = saa7127_remove, 814 .remove = saa7127_remove,
816 .id_table = saa7127_id, 815 .id_table = saa7127_id,
diff --git a/drivers/media/video/saa7185.c b/drivers/media/video/saa7185.c
index b4eb66253bc2..75747b104d07 100644
--- a/drivers/media/video/saa7185.c
+++ b/drivers/media/video/saa7185.c
@@ -33,7 +33,7 @@
33#include <linux/videodev2.h> 33#include <linux/videodev2.h>
34#include <media/v4l2-device.h> 34#include <media/v4l2-device.h>
35#include <media/v4l2-chip-ident.h> 35#include <media/v4l2-chip-ident.h>
36#include <media/v4l2-i2c-drv-legacy.h> 36#include <media/v4l2-i2c-drv.h>
37 37
38MODULE_DESCRIPTION("Philips SAA7185 video encoder driver"); 38MODULE_DESCRIPTION("Philips SAA7185 video encoder driver");
39MODULE_AUTHOR("Dave Perks"); 39MODULE_AUTHOR("Dave Perks");
@@ -43,9 +43,6 @@ static int debug;
43module_param(debug, int, 0); 43module_param(debug, int, 0);
44MODULE_PARM_DESC(debug, "Debug level (0-1)"); 44MODULE_PARM_DESC(debug, "Debug level (0-1)");
45 45
46static unsigned short normal_i2c[] = { 0x88 >> 1, I2C_CLIENT_END };
47
48I2C_CLIENT_INSMOD;
49 46
50/* ----------------------------------------------------------------------- */ 47/* ----------------------------------------------------------------------- */
51 48
@@ -295,11 +292,6 @@ static int saa7185_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ide
295 return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_SAA7185, 0); 292 return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_SAA7185, 0);
296} 293}
297 294
298static int saa7185_command(struct i2c_client *client, unsigned cmd, void *arg)
299{
300 return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
301}
302
303/* ----------------------------------------------------------------------- */ 295/* ----------------------------------------------------------------------- */
304 296
305static const struct v4l2_subdev_core_ops saa7185_core_ops = { 297static const struct v4l2_subdev_core_ops saa7185_core_ops = {
@@ -374,8 +366,6 @@ MODULE_DEVICE_TABLE(i2c, saa7185_id);
374 366
375static struct v4l2_i2c_driver_data v4l2_i2c_data = { 367static struct v4l2_i2c_driver_data v4l2_i2c_data = {
376 .name = "saa7185", 368 .name = "saa7185",
377 .driverid = I2C_DRIVERID_SAA7185B,
378 .command = saa7185_command,
379 .probe = saa7185_probe, 369 .probe = saa7185_probe,
380 .remove = saa7185_remove, 370 .remove = saa7185_remove,
381 .id_table = saa7185_id, 371 .id_table = saa7185_id,
diff --git a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c
index 476a204dcf90..ed50b912d8a0 100644
--- a/drivers/media/video/vpx3220.c
+++ b/drivers/media/video/vpx3220.c
@@ -27,7 +27,7 @@
27#include <linux/videodev2.h> 27#include <linux/videodev2.h>
28#include <media/v4l2-device.h> 28#include <media/v4l2-device.h>
29#include <media/v4l2-chip-ident.h> 29#include <media/v4l2-chip-ident.h>
30#include <media/v4l2-i2c-drv-legacy.h> 30#include <media/v4l2-i2c-drv.h>
31 31
32MODULE_DESCRIPTION("vpx3220a/vpx3216b/vpx3214c video decoder driver"); 32MODULE_DESCRIPTION("vpx3220a/vpx3216b/vpx3214c video decoder driver");
33MODULE_AUTHOR("Laurent Pinchart"); 33MODULE_AUTHOR("Laurent Pinchart");
@@ -37,9 +37,6 @@ static int debug;
37module_param(debug, int, 0); 37module_param(debug, int, 0);
38MODULE_PARM_DESC(debug, "Debug level (0-1)"); 38MODULE_PARM_DESC(debug, "Debug level (0-1)");
39 39
40static unsigned short normal_i2c[] = { 0x86 >> 1, 0x8e >> 1, I2C_CLIENT_END };
41
42I2C_CLIENT_INSMOD;
43 40
44#define VPX_TIMEOUT_COUNT 10 41#define VPX_TIMEOUT_COUNT 10
45 42
@@ -511,11 +508,6 @@ static int vpx3220_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ide
511 return v4l2_chip_ident_i2c_client(client, chip, decoder->ident, 0); 508 return v4l2_chip_ident_i2c_client(client, chip, decoder->ident, 0);
512} 509}
513 510
514static int vpx3220_command(struct i2c_client *client, unsigned cmd, void *arg)
515{
516 return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
517}
518
519/* ----------------------------------------------------------------------- */ 511/* ----------------------------------------------------------------------- */
520 512
521static const struct v4l2_subdev_core_ops vpx3220_core_ops = { 513static const struct v4l2_subdev_core_ops vpx3220_core_ops = {
@@ -626,8 +618,6 @@ MODULE_DEVICE_TABLE(i2c, vpx3220_id);
626 618
627static struct v4l2_i2c_driver_data v4l2_i2c_data = { 619static struct v4l2_i2c_driver_data v4l2_i2c_data = {
628 .name = "vpx3220", 620 .name = "vpx3220",
629 .driverid = I2C_DRIVERID_VPX3220,
630 .command = vpx3220_command,
631 .probe = vpx3220_probe, 621 .probe = vpx3220_probe,
632 .remove = vpx3220_remove, 622 .remove = vpx3220_remove,
633 .id_table = vpx3220_id, 623 .id_table = vpx3220_id,
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-30 14:58:23 -0500