[media] s5p-fimc: Remove v4l2_device from video capture and m2m driver

Currently there is a v4l2_device instance being registered per each
(capture and memory-to-memory) video node created per FIMC H/W instance.
This patch is a prerequisite for using the top level v4l2_device
instantiated by the media device driver.
To retain current debug trace semantic (so it's possible to distinguish
between the capture and m2m FIMC) the video_device is used in place
of v4l2_device where appropriate.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/media/video/s5p-fimc/fimc-reg.c b/drivers/media/video/s5p-fimc/fimc-reg.c
index 938dadf250f7..c6882636ea94 100644
--- a/drivers/media/video/s5p-fimc/fimc-reg.c
+++ b/drivers/media/video/s5p-fimc/fimc-reg.c
@@ -596,7 +596,7 @@ int fimc_hw_set_camera_source(struct fimc_dev *fimc,
                 }
 
                 if (i == ARRAY_SIZE(pix_desc)) {
-                        v4l2_err(&fimc->vid_cap.v4l2_dev,
+                        v4l2_err(fimc->vid_cap.vfd,
                                  "Camera color format not supported: %d\n",
                                  fimc->vid_cap.fmt.code);
                         return -EINVAL;
@@ -661,8 +661,9 @@ int fimc_hw_set_camera_type(struct fimc_dev *fimc,
                 if (vid_cap->fmt.code == V4L2_MBUS_FMT_VYUY8_2X8) {
                         tmp = S5P_CSIIMGFMT_YCBCR422_8BIT;
                 } else {
-                        err("camera image format not supported: %d",
-                            vid_cap->fmt.code);
+                        v4l2_err(fimc->vid_cap.vfd,
+                                 "Not supported camera pixel format: %d",
+                                 vid_cap->fmt.code);
                         return -EINVAL;
                 }
                 tmp |= (cam->csi_data_align == 32) << 8;