aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/i2c/tw2804.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/drivers/media/i2c/tw2804.c b/drivers/media/i2c/tw2804.c
index 441b7661d491..c5dc2c3bf2d7 100644
--- a/drivers/media/i2c/tw2804.c
+++ b/drivers/media/i2c/tw2804.c
@@ -53,7 +53,7 @@ static const u8 global_registers[] = {
53 0x3d, 0x80, 53 0x3d, 0x80,
54 0x3e, 0x82, 54 0x3e, 0x82,
55 0x3f, 0x82, 55 0x3f, 0x82,
56 0x78, 0x0f, 56 0x78, 0x00,
57 0xff, 0xff, /* Terminator (reg 0xff does not exist) */ 57 0xff, 0xff, /* Terminator (reg 0xff does not exist) */
58}; 58};
59 59
@@ -337,20 +337,6 @@ static int tw2804_s_video_routing(struct v4l2_subdev *sd, u32 input, u32 output,
337 return 0; 337 return 0;
338} 338}
339 339
340static int tw2804_s_stream(struct v4l2_subdev *sd, int enable)
341{
342 struct tw2804 *dec = to_state(sd);
343 struct i2c_client *client = v4l2_get_subdevdata(sd);
344 u32 reg = read_reg(client, 0x78, 0);
345
346 if (enable == 1)
347 write_reg(client, 0x78, reg & ~(1 << dec->channel), 0);
348 else
349 write_reg(client, 0x78, reg | (1 << dec->channel), 0);
350
351 return 0;
352}
353
354static const struct v4l2_ctrl_ops tw2804_ctrl_ops = { 340static const struct v4l2_ctrl_ops tw2804_ctrl_ops = {
355 .g_volatile_ctrl = tw2804_g_volatile_ctrl, 341 .g_volatile_ctrl = tw2804_g_volatile_ctrl,
356 .s_ctrl = tw2804_s_ctrl, 342 .s_ctrl = tw2804_s_ctrl,
@@ -358,7 +344,6 @@ static const struct v4l2_ctrl_ops tw2804_ctrl_ops = {
358 344
359static const struct v4l2_subdev_video_ops tw2804_video_ops = { 345static const struct v4l2_subdev_video_ops tw2804_video_ops = {
360 .s_routing = tw2804_s_video_routing, 346 .s_routing = tw2804_s_video_routing,
361 .s_stream = tw2804_s_stream,
362}; 347};
363 348
364static const struct v4l2_subdev_core_ops tw2804_core_ops = { 349static const struct v4l2_subdev_core_ops tw2804_core_ops = {