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/adv7183.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/adv7183.c')
-rw-r--r-- | drivers/media/i2c/adv7183.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/drivers/media/i2c/adv7183.c b/drivers/media/i2c/adv7183.c index 7c48e22b41a2..980815d37bb1 100644 --- a/drivers/media/i2c/adv7183.c +++ b/drivers/media/i2c/adv7183.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #include <linux/videodev2.h> | 28 | #include <linux/videodev2.h> |
29 | 29 | ||
30 | #include <media/adv7183.h> | 30 | #include <media/adv7183.h> |
31 | #include <media/v4l2-chip-ident.h> | ||
32 | #include <media/v4l2-ctrls.h> | 31 | #include <media/v4l2-ctrls.h> |
33 | #include <media/v4l2-device.h> | 32 | #include <media/v4l2-device.h> |
34 | 33 | ||
@@ -481,25 +480,9 @@ static int adv7183_s_stream(struct v4l2_subdev *sd, int enable) | |||
481 | return 0; | 480 | return 0; |
482 | } | 481 | } |
483 | 482 | ||
484 | static int adv7183_g_chip_ident(struct v4l2_subdev *sd, | ||
485 | struct v4l2_dbg_chip_ident *chip) | ||
486 | { | ||
487 | int rev; | ||
488 | struct i2c_client *client = v4l2_get_subdevdata(sd); | ||
489 | |||
490 | /* 0x11 for adv7183, 0x13 for adv7183b */ | ||
491 | rev = adv7183_read(sd, ADV7183_IDENT); | ||
492 | |||
493 | return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_ADV7183, rev); | ||
494 | } | ||
495 | |||
496 | #ifdef CONFIG_VIDEO_ADV_DEBUG | 483 | #ifdef CONFIG_VIDEO_ADV_DEBUG |
497 | static int adv7183_g_register(struct v4l2_subdev *sd, struct v4l2_dbg_register *reg) | 484 | static int adv7183_g_register(struct v4l2_subdev *sd, struct v4l2_dbg_register *reg) |
498 | { | 485 | { |
499 | struct i2c_client *client = v4l2_get_subdevdata(sd); | ||
500 | |||
501 | if (!v4l2_chip_match_i2c_client(client, ®->match)) | ||
502 | return -EINVAL; | ||
503 | reg->val = adv7183_read(sd, reg->reg & 0xff); | 486 | reg->val = adv7183_read(sd, reg->reg & 0xff); |
504 | reg->size = 1; | 487 | reg->size = 1; |
505 | return 0; | 488 | return 0; |
@@ -507,10 +490,6 @@ static int adv7183_g_register(struct v4l2_subdev *sd, struct v4l2_dbg_register * | |||
507 | 490 | ||
508 | static int adv7183_s_register(struct v4l2_subdev *sd, const struct v4l2_dbg_register *reg) | 491 | static int adv7183_s_register(struct v4l2_subdev *sd, const struct v4l2_dbg_register *reg) |
509 | { | 492 | { |
510 | struct i2c_client *client = v4l2_get_subdevdata(sd); | ||
511 | |||
512 | if (!v4l2_chip_match_i2c_client(client, ®->match)) | ||
513 | return -EINVAL; | ||
514 | adv7183_write(sd, reg->reg & 0xff, reg->val & 0xff); | 493 | adv7183_write(sd, reg->reg & 0xff, reg->val & 0xff); |
515 | return 0; | 494 | return 0; |
516 | } | 495 | } |
@@ -525,7 +504,6 @@ static const struct v4l2_subdev_core_ops adv7183_core_ops = { | |||
525 | .g_std = adv7183_g_std, | 504 | .g_std = adv7183_g_std, |
526 | .s_std = adv7183_s_std, | 505 | .s_std = adv7183_s_std, |
527 | .reset = adv7183_reset, | 506 | .reset = adv7183_reset, |
528 | .g_chip_ident = adv7183_g_chip_ident, | ||
529 | #ifdef CONFIG_VIDEO_ADV_DEBUG | 507 | #ifdef CONFIG_VIDEO_ADV_DEBUG |
530 | .g_register = adv7183_g_register, | 508 | .g_register = adv7183_g_register, |
531 | .s_register = adv7183_s_register, | 509 | .s_register = adv7183_s_register, |