media: vimc: Remove or modify stream checks

Change the way subdevices check if the stream is running. Verify the stream
pointer instead of src_frame. This makes easier to get rid of the void* and
u8* that points to frames in the subdevices structs.

Remove checks that s_stream does on subdevices. They are redundant since
the Media Controller Framework doesn't allow two streaming on the same
media pipeline at the same time.

Signed-off-by: André Almeida <andrealmeid@collabora.com>
Acked-by: Helen Koike <helen.koike@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

1 files changed, 2 insertions, 5 deletions

diff --git a/drivers/media/platform/vimc/vimc-scaler.c b/drivers/media/platform/vimc/vimc-scaler.c
index 8aecf8e92031..617f2920b86b 100644
--- a/drivers/media/platform/vimc/vimc-scaler.c
+++ b/drivers/media/platform/vimc/vimc-scaler.c
@@ -158,7 +158,7 @@ static int vimc_sca_set_fmt(struct v4l2_subdev *sd,
 
         if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
                 /* Do not change the format while stream is on */
-                if (vsca->src_frame)
+                if (vsca->ved.stream)
                         return -EBUSY;
 
                 sink_fmt = &vsca->sink_fmt;
@@ -213,9 +213,6 @@ static int vimc_sca_s_stream(struct v4l2_subdev *sd, int enable)
                 const struct v4l2_format_info *pix_info;
                 unsigned int frame_size;
 
-                if (vsca->src_frame)
-                        return 0;
-
                 if (!vimc_sca_is_pixfmt_supported(pixelformat)) {
                         dev_err(vsca->dev, "pixfmt (0x%08x) is not supported\n",
                                 pixelformat);
@@ -337,7 +334,7 @@ static void *vimc_sca_process_frame(struct vimc_ent_device *ved,
                                                     ved);
 
         /* If the stream in this node is not active, just return */
-        if (!vsca->src_frame)
+        if (!ved->stream)
                 return ERR_PTR(-EINVAL);
 
         vimc_sca_fill_src_frame(vsca, sink_frame);