aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/i2c/cx25840
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-05-29 05:59:51 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-06-17 07:52:10 -0400
commite12771100c93e101a7a8b302b6c5d57cff7b1551 (patch)
treea831f1d64d92142e5ce4cbcdfcd5a6f623db04e9 /drivers/media/i2c/cx25840
parent6be89daa03a4c99b0d22a59a660b225a592ed0a9 (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/cx25840')
-rw-r--r--drivers/media/i2c/cx25840/cx25840-core.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/media/i2c/cx25840/cx25840-core.c b/drivers/media/i2c/cx25840/cx25840-core.c
index b81e32f371ae..6fbdad4fe054 100644
--- a/drivers/media/i2c/cx25840/cx25840-core.c
+++ b/drivers/media/i2c/cx25840/cx25840-core.c
@@ -45,7 +45,6 @@
45#include <linux/delay.h> 45#include <linux/delay.h>
46#include <linux/math64.h> 46#include <linux/math64.h>
47#include <media/v4l2-common.h> 47#include <media/v4l2-common.h>
48#include <media/v4l2-chip-ident.h>
49#include <media/cx25840.h> 48#include <media/cx25840.h>
50 49
51#include "cx25840-core.h" 50#include "cx25840-core.h"
@@ -1662,8 +1661,6 @@ static int cx25840_g_register(struct v4l2_subdev *sd, struct v4l2_dbg_register *
1662{ 1661{
1663 struct i2c_client *client = v4l2_get_subdevdata(sd); 1662 struct i2c_client *client = v4l2_get_subdevdata(sd);
1664 1663
1665 if (!v4l2_chip_match_i2c_client(client, &reg->match))
1666 return -EINVAL;
1667 reg->size = 1; 1664 reg->size = 1;
1668 reg->val = cx25840_read(client, reg->reg & 0x0fff); 1665 reg->val = cx25840_read(client, reg->reg & 0x0fff);
1669 return 0; 1666 return 0;
@@ -1673,8 +1670,6 @@ static int cx25840_s_register(struct v4l2_subdev *sd, const struct v4l2_dbg_regi
1673{ 1670{
1674 struct i2c_client *client = v4l2_get_subdevdata(sd); 1671 struct i2c_client *client = v4l2_get_subdevdata(sd);
1675 1672
1676 if (!v4l2_chip_match_i2c_client(client, &reg->match))
1677 return -EINVAL;
1678 cx25840_write(client, reg->reg & 0x0fff, reg->val & 0xff); 1673 cx25840_write(client, reg->reg & 0x0fff, reg->val & 0xff);
1679 return 0; 1674 return 0;
1680} 1675}
@@ -1934,14 +1929,6 @@ static int cx25840_reset(struct v4l2_subdev *sd, u32 val)
1934 return 0; 1929 return 0;
1935} 1930}
1936 1931
1937static int cx25840_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident *chip)
1938{
1939 struct cx25840_state *state = to_state(sd);
1940 struct i2c_client *client = v4l2_get_subdevdata(sd);
1941
1942 return v4l2_chip_ident_i2c_client(client, chip, state->id, state->rev);
1943}
1944
1945static int cx25840_log_status(struct v4l2_subdev *sd) 1932static int cx25840_log_status(struct v4l2_subdev *sd)
1946{ 1933{
1947 struct cx25840_state *state = to_state(sd); 1934 struct cx25840_state *state = to_state(sd);
@@ -5047,7 +5034,6 @@ static const struct v4l2_ctrl_ops cx25840_ctrl_ops = {
5047 5034
5048static const struct v4l2_subdev_core_ops cx25840_core_ops = { 5035static const struct v4l2_subdev_core_ops cx25840_core_ops = {
5049 .log_status = cx25840_log_status, 5036 .log_status = cx25840_log_status,
5050 .g_chip_ident = cx25840_g_chip_ident,
5051 .g_ctrl = v4l2_subdev_g_ctrl, 5037 .g_ctrl = v4l2_subdev_g_ctrl,
5052 .s_ctrl = v4l2_subdev_s_ctrl, 5038 .s_ctrl = v4l2_subdev_s_ctrl,
5053 .s_ext_ctrls = v4l2_subdev_s_ext_ctrls, 5039 .s_ext_ctrls = v4l2_subdev_s_ext_ctrls,