diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-05-29 05:59:51 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-06-17 07:52:10 -0400 |
commit | e12771100c93e101a7a8b302b6c5d57cff7b1551 (patch) | |
tree | a831f1d64d92142e5ce4cbcdfcd5a6f623db04e9 /drivers/media/i2c/bt819.c | |
parent | 6be89daa03a4c99b0d22a59a660b225a592ed0a9 (diff) |
[media] media/i2c: remove g_chip_ident op
This is no longer needed since the core now handles this through DBG_G_CHIP_INFO.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/i2c/bt819.c')
-rw-r--r-- | drivers/media/i2c/bt819.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/media/i2c/bt819.c b/drivers/media/i2c/bt819.c index ee9ed67e7910..ae1eac01bbc7 100644 --- a/drivers/media/i2c/bt819.c +++ b/drivers/media/i2c/bt819.c | |||
@@ -36,7 +36,6 @@ | |||
36 | #include <linux/videodev2.h> | 36 | #include <linux/videodev2.h> |
37 | #include <linux/slab.h> | 37 | #include <linux/slab.h> |
38 | #include <media/v4l2-device.h> | 38 | #include <media/v4l2-device.h> |
39 | #include <media/v4l2-chip-ident.h> | ||
40 | #include <media/v4l2-ctrls.h> | 39 | #include <media/v4l2-ctrls.h> |
41 | #include <media/bt819.h> | 40 | #include <media/bt819.h> |
42 | 41 | ||
@@ -57,7 +56,6 @@ struct bt819 { | |||
57 | unsigned char reg[32]; | 56 | unsigned char reg[32]; |
58 | 57 | ||
59 | v4l2_std_id norm; | 58 | v4l2_std_id norm; |
60 | int ident; | ||
61 | int input; | 59 | int input; |
62 | int enable; | 60 | int enable; |
63 | }; | 61 | }; |
@@ -373,14 +371,6 @@ static int bt819_s_ctrl(struct v4l2_ctrl *ctrl) | |||
373 | return 0; | 371 | return 0; |
374 | } | 372 | } |
375 | 373 | ||
376 | static int bt819_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident *chip) | ||
377 | { | ||
378 | struct bt819 *decoder = to_bt819(sd); | ||
379 | struct i2c_client *client = v4l2_get_subdevdata(sd); | ||
380 | |||
381 | return v4l2_chip_ident_i2c_client(client, chip, decoder->ident, 0); | ||
382 | } | ||
383 | |||
384 | /* ----------------------------------------------------------------------- */ | 374 | /* ----------------------------------------------------------------------- */ |
385 | 375 | ||
386 | static const struct v4l2_ctrl_ops bt819_ctrl_ops = { | 376 | static const struct v4l2_ctrl_ops bt819_ctrl_ops = { |
@@ -388,7 +378,6 @@ static const struct v4l2_ctrl_ops bt819_ctrl_ops = { | |||
388 | }; | 378 | }; |
389 | 379 | ||
390 | static const struct v4l2_subdev_core_ops bt819_core_ops = { | 380 | static const struct v4l2_subdev_core_ops bt819_core_ops = { |
391 | .g_chip_ident = bt819_g_chip_ident, | ||
392 | .g_ext_ctrls = v4l2_subdev_g_ext_ctrls, | 381 | .g_ext_ctrls = v4l2_subdev_g_ext_ctrls, |
393 | .try_ext_ctrls = v4l2_subdev_try_ext_ctrls, | 382 | .try_ext_ctrls = v4l2_subdev_try_ext_ctrls, |
394 | .s_ext_ctrls = v4l2_subdev_s_ext_ctrls, | 383 | .s_ext_ctrls = v4l2_subdev_s_ext_ctrls, |
@@ -435,15 +424,12 @@ static int bt819_probe(struct i2c_client *client, | |||
435 | switch (ver & 0xf0) { | 424 | switch (ver & 0xf0) { |
436 | case 0x70: | 425 | case 0x70: |
437 | name = "bt819a"; | 426 | name = "bt819a"; |
438 | decoder->ident = V4L2_IDENT_BT819A; | ||
439 | break; | 427 | break; |
440 | case 0x60: | 428 | case 0x60: |
441 | name = "bt817a"; | 429 | name = "bt817a"; |
442 | decoder->ident = V4L2_IDENT_BT817A; | ||
443 | break; | 430 | break; |
444 | case 0x20: | 431 | case 0x20: |
445 | name = "bt815a"; | 432 | name = "bt815a"; |
446 | decoder->ident = V4L2_IDENT_BT815A; | ||
447 | break; | 433 | break; |
448 | default: | 434 | default: |
449 | v4l2_dbg(1, debug, sd, | 435 | v4l2_dbg(1, debug, sd, |