aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/i2c/vpx3220.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/i2c/vpx3220.c')
-rw-r--r--drivers/media/i2c/vpx3220.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/media/i2c/vpx3220.c b/drivers/media/i2c/vpx3220.c
index f02e74b9b1ac..4c57d8a67c22 100644
--- a/drivers/media/i2c/vpx3220.c
+++ b/drivers/media/i2c/vpx3220.c
@@ -27,7 +27,6 @@
27#include <linux/i2c.h> 27#include <linux/i2c.h>
28#include <linux/videodev2.h> 28#include <linux/videodev2.h>
29#include <media/v4l2-device.h> 29#include <media/v4l2-device.h>
30#include <media/v4l2-chip-ident.h>
31#include <media/v4l2-ctrls.h> 30#include <media/v4l2-ctrls.h>
32 31
33MODULE_DESCRIPTION("vpx3220a/vpx3216b/vpx3214c video decoder driver"); 32MODULE_DESCRIPTION("vpx3220a/vpx3216b/vpx3214c video decoder driver");
@@ -49,7 +48,6 @@ struct vpx3220 {
49 unsigned char reg[255]; 48 unsigned char reg[255];
50 49
51 v4l2_std_id norm; 50 v4l2_std_id norm;
52 int ident;
53 int input; 51 int input;
54 int enable; 52 int enable;
55}; 53};
@@ -442,14 +440,6 @@ static int vpx3220_s_ctrl(struct v4l2_ctrl *ctrl)
442 return -EINVAL; 440 return -EINVAL;
443} 441}
444 442
445static int vpx3220_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident *chip)
446{
447 struct vpx3220 *decoder = to_vpx3220(sd);
448 struct i2c_client *client = v4l2_get_subdevdata(sd);
449
450 return v4l2_chip_ident_i2c_client(client, chip, decoder->ident, 0);
451}
452
453/* ----------------------------------------------------------------------- */ 443/* ----------------------------------------------------------------------- */
454 444
455static const struct v4l2_ctrl_ops vpx3220_ctrl_ops = { 445static const struct v4l2_ctrl_ops vpx3220_ctrl_ops = {
@@ -457,7 +447,6 @@ static const struct v4l2_ctrl_ops vpx3220_ctrl_ops = {
457}; 447};
458 448
459static const struct v4l2_subdev_core_ops vpx3220_core_ops = { 449static const struct v4l2_subdev_core_ops vpx3220_core_ops = {
460 .g_chip_ident = vpx3220_g_chip_ident,
461 .init = vpx3220_init, 450 .init = vpx3220_init,
462 .g_ext_ctrls = v4l2_subdev_g_ext_ctrls, 451 .g_ext_ctrls = v4l2_subdev_g_ext_ctrls,
463 .try_ext_ctrls = v4l2_subdev_try_ext_ctrls, 452 .try_ext_ctrls = v4l2_subdev_try_ext_ctrls,
@@ -528,7 +517,6 @@ static int vpx3220_probe(struct i2c_client *client,
528 ver = i2c_smbus_read_byte_data(client, 0x00); 517 ver = i2c_smbus_read_byte_data(client, 0x00);
529 pn = (i2c_smbus_read_byte_data(client, 0x02) << 8) + 518 pn = (i2c_smbus_read_byte_data(client, 0x02) << 8) +
530 i2c_smbus_read_byte_data(client, 0x01); 519 i2c_smbus_read_byte_data(client, 0x01);
531 decoder->ident = V4L2_IDENT_VPX3220A;
532 if (ver == 0xec) { 520 if (ver == 0xec) {
533 switch (pn) { 521 switch (pn) {
534 case 0x4680: 522 case 0x4680:
@@ -536,11 +524,9 @@ static int vpx3220_probe(struct i2c_client *client,
536 break; 524 break;
537 case 0x4260: 525 case 0x4260:
538 name = "vpx3216b"; 526 name = "vpx3216b";
539 decoder->ident = V4L2_IDENT_VPX3216B;
540 break; 527 break;
541 case 0x4280: 528 case 0x4280:
542 name = "vpx3214c"; 529 name = "vpx3214c";
543 decoder->ident = V4L2_IDENT_VPX3214C;
544 break; 530 break;
545 } 531 }
546 } 532 }