aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/i2c/m52790.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/i2c/m52790.c')
-rw-r--r--drivers/media/i2c/m52790.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/media/i2c/m52790.c b/drivers/media/i2c/m52790.c
index 3eeb546be6d9..bf476358704d 100644
--- a/drivers/media/i2c/m52790.c
+++ b/drivers/media/i2c/m52790.c
@@ -29,7 +29,6 @@
29#include <linux/videodev2.h> 29#include <linux/videodev2.h>
30#include <media/m52790.h> 30#include <media/m52790.h>
31#include <media/v4l2-device.h> 31#include <media/v4l2-device.h>
32#include <media/v4l2-chip-ident.h>
33 32
34MODULE_DESCRIPTION("i2c device driver for m52790 A/V switch"); 33MODULE_DESCRIPTION("i2c device driver for m52790 A/V switch");
35MODULE_AUTHOR("Hans Verkuil"); 34MODULE_AUTHOR("Hans Verkuil");
@@ -83,10 +82,7 @@ static int m52790_s_routing(struct v4l2_subdev *sd,
83static int m52790_g_register(struct v4l2_subdev *sd, struct v4l2_dbg_register *reg) 82static int m52790_g_register(struct v4l2_subdev *sd, struct v4l2_dbg_register *reg)
84{ 83{
85 struct m52790_state *state = to_state(sd); 84 struct m52790_state *state = to_state(sd);
86 struct i2c_client *client = v4l2_get_subdevdata(sd);
87 85
88 if (!v4l2_chip_match_i2c_client(client, &reg->match))
89 return -EINVAL;
90 if (reg->reg != 0) 86 if (reg->reg != 0)
91 return -EINVAL; 87 return -EINVAL;
92 reg->size = 1; 88 reg->size = 1;
@@ -97,10 +93,7 @@ static int m52790_g_register(struct v4l2_subdev *sd, struct v4l2_dbg_register *r
97static int m52790_s_register(struct v4l2_subdev *sd, const struct v4l2_dbg_register *reg) 93static int m52790_s_register(struct v4l2_subdev *sd, const struct v4l2_dbg_register *reg)
98{ 94{
99 struct m52790_state *state = to_state(sd); 95 struct m52790_state *state = to_state(sd);
100 struct i2c_client *client = v4l2_get_subdevdata(sd);
101 96
102 if (!v4l2_chip_match_i2c_client(client, &reg->match))
103 return -EINVAL;
104 if (reg->reg != 0) 97 if (reg->reg != 0)
105 return -EINVAL; 98 return -EINVAL;
106 state->input = reg->val & 0x0303; 99 state->input = reg->val & 0x0303;
@@ -110,13 +103,6 @@ static int m52790_s_register(struct v4l2_subdev *sd, const struct v4l2_dbg_regis
110} 103}
111#endif 104#endif
112 105
113static int m52790_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident *chip)
114{
115 struct i2c_client *client = v4l2_get_subdevdata(sd);
116
117 return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_M52790, 0);
118}
119
120static int m52790_log_status(struct v4l2_subdev *sd) 106static int m52790_log_status(struct v4l2_subdev *sd)
121{ 107{
122 struct m52790_state *state = to_state(sd); 108 struct m52790_state *state = to_state(sd);
@@ -132,7 +118,6 @@ static int m52790_log_status(struct v4l2_subdev *sd)
132 118
133static const struct v4l2_subdev_core_ops m52790_core_ops = { 119static const struct v4l2_subdev_core_ops m52790_core_ops = {
134 .log_status = m52790_log_status, 120 .log_status = m52790_log_status,
135 .g_chip_ident = m52790_g_chip_ident,
136#ifdef CONFIG_VIDEO_ADV_DEBUG 121#ifdef CONFIG_VIDEO_ADV_DEBUG
137 .g_register = m52790_g_register, 122 .g_register = m52790_g_register,
138 .s_register = m52790_s_register, 123 .s_register = m52790_s_register,