Commit f33354f0 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab

[media] v4l: omap4iss: Remove iss_video streaming field

The vb2 queue already keeps track of the streaming state, there's no
need to duplicate that in the driver.
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 35c71be8
...@@ -743,11 +743,6 @@ iss_video_streamon(struct file *file, void *fh, enum v4l2_buf_type type) ...@@ -743,11 +743,6 @@ iss_video_streamon(struct file *file, void *fh, enum v4l2_buf_type type)
mutex_lock(&video->stream_lock); mutex_lock(&video->stream_lock);
if (video->streaming) {
mutex_unlock(&video->stream_lock);
return -EBUSY;
}
/* Start streaming on the pipeline. No link touching an entity in the /* Start streaming on the pipeline. No link touching an entity in the
* pipeline can be activated or deactivated once streaming is started. * pipeline can be activated or deactivated once streaming is started.
*/ */
...@@ -842,9 +837,6 @@ iss_video_streamon(struct file *file, void *fh, enum v4l2_buf_type type) ...@@ -842,9 +837,6 @@ iss_video_streamon(struct file *file, void *fh, enum v4l2_buf_type type)
video->queue = NULL; video->queue = NULL;
} }
if (!ret)
video->streaming = 1;
mutex_unlock(&video->stream_lock); mutex_unlock(&video->stream_lock);
return ret; return ret;
} }
...@@ -882,7 +874,6 @@ iss_video_streamoff(struct file *file, void *fh, enum v4l2_buf_type type) ...@@ -882,7 +874,6 @@ iss_video_streamoff(struct file *file, void *fh, enum v4l2_buf_type type)
omap4iss_pipeline_set_stream(pipe, ISS_PIPELINE_STREAM_STOPPED); omap4iss_pipeline_set_stream(pipe, ISS_PIPELINE_STREAM_STOPPED);
vb2_streamoff(&vfh->queue, type); vb2_streamoff(&vfh->queue, type);
video->queue = NULL; video->queue = NULL;
video->streaming = 0;
if (video->iss->pdata->set_constraints) if (video->iss->pdata->set_constraints)
video->iss->pdata->set_constraints(video->iss, false); video->iss->pdata->set_constraints(video->iss, false);
......
...@@ -156,9 +156,6 @@ struct iss_video { ...@@ -156,9 +156,6 @@ struct iss_video {
unsigned int bpl_value; /* bytes per line value */ unsigned int bpl_value; /* bytes per line value */
unsigned int bpl_padding; /* padding at end of line */ unsigned int bpl_padding; /* padding at end of line */
/* Entity video node streaming */
unsigned int streaming:1;
/* Pipeline state */ /* Pipeline state */
struct iss_pipeline pipe; struct iss_pipeline pipe;
struct mutex stream_lock; /* pipeline and stream states */ struct mutex stream_lock; /* pipeline and stream states */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment