aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/vpx3220.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/vpx3220.c')
-rw-r--r--drivers/media/video/vpx3220.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c
index 0cc23539f74d..2fa7e8bb5746 100644
--- a/drivers/media/video/vpx3220.c
+++ b/drivers/media/video/vpx3220.c
@@ -296,8 +296,6 @@ static int vpx3220_status(struct v4l2_subdev *sd, u32 *pstatus, v4l2_std_id *pst
296 int res = V4L2_IN_ST_NO_SIGNAL, status; 296 int res = V4L2_IN_ST_NO_SIGNAL, status;
297 v4l2_std_id std = 0; 297 v4l2_std_id std = 0;
298 298
299 v4l2_dbg(1, debug, sd, "VIDIOC_QUERYSTD/VIDIOC_INT_G_INPUT_STATUS\n");
300
301 status = vpx3220_fp_read(sd, 0x0f3); 299 status = vpx3220_fp_read(sd, 0x0f3);
302 300
303 v4l2_dbg(1, debug, sd, "status: 0x%04x\n", status); 301 v4l2_dbg(1, debug, sd, "status: 0x%04x\n", status);
@@ -336,11 +334,13 @@ static int vpx3220_status(struct v4l2_subdev *sd, u32 *pstatus, v4l2_std_id *pst
336 334
337static int vpx3220_querystd(struct v4l2_subdev *sd, v4l2_std_id *std) 335static int vpx3220_querystd(struct v4l2_subdev *sd, v4l2_std_id *std)
338{ 336{
337 v4l2_dbg(1, debug, sd, "querystd\n");
339 return vpx3220_status(sd, NULL, std); 338 return vpx3220_status(sd, NULL, std);
340} 339}
341 340
342static int vpx3220_g_input_status(struct v4l2_subdev *sd, u32 *status) 341static int vpx3220_g_input_status(struct v4l2_subdev *sd, u32 *status)
343{ 342{
343 v4l2_dbg(1, debug, sd, "g_input_status\n");
344 return vpx3220_status(sd, status, NULL); 344 return vpx3220_status(sd, status, NULL);
345} 345}
346 346
@@ -354,7 +354,7 @@ static int vpx3220_s_std(struct v4l2_subdev *sd, v4l2_std_id std)
354 choosen video norm */ 354 choosen video norm */
355 temp_input = vpx3220_fp_read(sd, 0xf2); 355 temp_input = vpx3220_fp_read(sd, 0xf2);
356 356
357 v4l2_dbg(1, debug, sd, "VIDIOC_S_STD %llx\n", (unsigned long long)std); 357 v4l2_dbg(1, debug, sd, "s_std %llx\n", (unsigned long long)std);
358 if (std & V4L2_STD_NTSC) { 358 if (std & V4L2_STD_NTSC) {
359 vpx3220_write_fp_block(sd, init_ntsc, sizeof(init_ntsc) >> 1); 359 vpx3220_write_fp_block(sd, init_ntsc, sizeof(init_ntsc) >> 1);
360 v4l2_dbg(1, debug, sd, "norm switched to NTSC\n"); 360 v4l2_dbg(1, debug, sd, "norm switched to NTSC\n");
@@ -410,7 +410,7 @@ static int vpx3220_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *
410 410
411static int vpx3220_s_stream(struct v4l2_subdev *sd, int enable) 411static int vpx3220_s_stream(struct v4l2_subdev *sd, int enable)
412{ 412{
413 v4l2_dbg(1, debug, sd, "VIDIOC_STREAM%s\n", enable ? "ON" : "OFF"); 413 v4l2_dbg(1, debug, sd, "s_stream %s\n", enable ? "on" : "off");
414 414
415 vpx3220_write(sd, 0xf2, (enable ? 0x1b : 0x00)); 415 vpx3220_write(sd, 0xf2, (enable ? 0x1b : 0x00));
416 return 0; 416 return 0;