aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-05-29 05:59:47 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-06-17 07:48:39 -0400
commit4b7be2bbe0fa8a0e70a61506dcdf088e3b8a8917 (patch)
tree4e24c2f58fd48b0f012951af3a190aa95bf2a215
parent33001010013749886eca5b5645efd80006dd2e51 (diff)
[media] au8522_decoder: 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> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/dvb-frontends/au8522_decoder.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/media/dvb-frontends/au8522_decoder.c b/drivers/media/dvb-frontends/au8522_decoder.c
index 9d159b48e50b..23a0d05ba426 100644
--- a/drivers/media/dvb-frontends/au8522_decoder.c
+++ b/drivers/media/dvb-frontends/au8522_decoder.c
@@ -35,7 +35,6 @@
35#include <linux/i2c.h> 35#include <linux/i2c.h>
36#include <linux/delay.h> 36#include <linux/delay.h>
37#include <media/v4l2-common.h> 37#include <media/v4l2-common.h>
38#include <media/v4l2-chip-ident.h>
39#include <media/v4l2-device.h> 38#include <media/v4l2-device.h>
40#include "au8522.h" 39#include "au8522.h"
41#include "au8522_priv.h" 40#include "au8522_priv.h"
@@ -524,11 +523,8 @@ static int au8522_s_ctrl(struct v4l2_ctrl *ctrl)
524static int au8522_g_register(struct v4l2_subdev *sd, 523static int au8522_g_register(struct v4l2_subdev *sd,
525 struct v4l2_dbg_register *reg) 524 struct v4l2_dbg_register *reg)
526{ 525{
527 struct i2c_client *client = v4l2_get_subdevdata(sd);
528 struct au8522_state *state = to_state(sd); 526 struct au8522_state *state = to_state(sd);
529 527
530 if (!v4l2_chip_match_i2c_client(client, &reg->match))
531 return -EINVAL;
532 reg->val = au8522_readreg(state, reg->reg & 0xffff); 528 reg->val = au8522_readreg(state, reg->reg & 0xffff);
533 return 0; 529 return 0;
534} 530}
@@ -536,11 +532,8 @@ static int au8522_g_register(struct v4l2_subdev *sd,
536static int au8522_s_register(struct v4l2_subdev *sd, 532static int au8522_s_register(struct v4l2_subdev *sd,
537 const struct v4l2_dbg_register *reg) 533 const struct v4l2_dbg_register *reg)
538{ 534{
539 struct i2c_client *client = v4l2_get_subdevdata(sd);
540 struct au8522_state *state = to_state(sd); 535 struct au8522_state *state = to_state(sd);
541 536
542 if (!v4l2_chip_match_i2c_client(client, &reg->match))
543 return -EINVAL;
544 au8522_writereg(state, reg->reg, reg->val & 0xff); 537 au8522_writereg(state, reg->reg, reg->val & 0xff);
545 return 0; 538 return 0;
546} 539}
@@ -632,20 +625,10 @@ static int au8522_g_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *vt)
632 return 0; 625 return 0;
633} 626}
634 627
635static int au8522_g_chip_ident(struct v4l2_subdev *sd,
636 struct v4l2_dbg_chip_ident *chip)
637{
638 struct au8522_state *state = to_state(sd);
639 struct i2c_client *client = v4l2_get_subdevdata(sd);
640
641 return v4l2_chip_ident_i2c_client(client, chip, state->id, state->rev);
642}
643
644/* ----------------------------------------------------------------------- */ 628/* ----------------------------------------------------------------------- */
645 629
646static const struct v4l2_subdev_core_ops au8522_core_ops = { 630static const struct v4l2_subdev_core_ops au8522_core_ops = {
647 .log_status = v4l2_ctrl_subdev_log_status, 631 .log_status = v4l2_ctrl_subdev_log_status,
648 .g_chip_ident = au8522_g_chip_ident,
649 .reset = au8522_reset, 632 .reset = au8522_reset,
650#ifdef CONFIG_VIDEO_ADV_DEBUG 633#ifdef CONFIG_VIDEO_ADV_DEBUG
651 .g_register = au8522_g_register, 634 .g_register = au8522_g_register,