omap3isp: Add omap3_isp_video_start/stop() functions

Those functions currently just encapsulate v4l2_stream_on() and
v4l2_stream_off(). They will later handle timeout timers.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

1 files changed, 22 insertions, 8 deletions

diff --git a/isp/omap3isp.c b/isp/omap3isp.c
index f48b7a0..005625b 100644
--- a/isp/omap3isp.c
+++ b/isp/omap3isp.c
@@ -135,6 +135,20 @@ static const char *entity_name(struct omap3_isp_entity *entity)
 }
 
 /* -----------------------------------------------------------------------------
+ * Video devices
+ */
+
+static int omap3_isp_video_start(struct omap3_isp_video *video)
+{
+	return v4l2_stream_on(video->video);
+}
+
+static int omap3_isp_video_stop(struct omap3_isp_video *video)
+{
+	return v4l2_stream_off(video->video);
+}
+
+/* -----------------------------------------------------------------------------
  * Pools
  */
 
@@ -218,13 +232,13 @@ static int omap3_isp_pool_start(struct omap3_isp_pool *pool)
 	pool->isp->ops->watch_fd(pool->input->video->fd, OMAP3_ISP_EVENT_READ,
 				 omap3_isp_pool_event_input, pool);
 
-	ret = v4l2_stream_on(pool->input->video);
+	ret = omap3_isp_video_start(pool->input);
 	if (ret < 0) {
 		printf("error: pool: streamon failed on input (%d)\n", ret);
 		return ret;
 	}
 
-	ret = v4l2_stream_on(pool->output->video);
+	ret = omap3_isp_video_start(pool->output);
 	if (ret < 0) {
 		printf("error: pool: streamon failed on output (%d)\n", ret);
 		return ret;
@@ -243,11 +257,11 @@ static void omap3_isp_pool_stop(struct omap3_isp_pool *pool)
 	pool->isp->ops->unwatch_fd(pool->input->video->fd);
 	pool->isp->ops->unwatch_fd(pool->output->video->fd);
 
-	ret = v4l2_stream_off(pool->input->video);
+	ret = omap3_isp_video_stop(pool->input);
 	if (ret < 0)
 		printf("error: pool: streamoff failed for input (%d)\n", ret);
 
-	ret = v4l2_stream_off(pool->output->video);
+	ret = omap3_isp_video_stop(pool->output);
 	if (ret < 0)
 		printf("error: pool: streamoff failed for output (%d)\n", ret);
 
@@ -961,7 +975,7 @@ int omap3_isp_viewfinder_start(struct omap3_isp_device *isp)
 			   OMAP3_ISP_EVENT_READ, omap3_isp_viewfinder_event,
 			   isp);
 
-	ret = v4l2_stream_on(isp->viewfinder.output->video);
+	ret = omap3_isp_video_start(isp->viewfinder.output);
 	if (ret < 0) {
 		printf("error: streamon failed for viewfinder (%d)\n", ret);
 		return ret;
@@ -979,7 +993,7 @@ int omap3_isp_viewfinder_stop(struct omap3_isp_device *isp)
 
 	isp->ops->unwatch_fd(isp->viewfinder.output->video->fd);
 
-	ret = v4l2_stream_off(isp->viewfinder.output->video);
+	ret = omap3_isp_video_stop(isp->viewfinder.output);
 	if (ret < 0) {
 		printf("error: streamoff failed for viewfinder\n");
 		return ret;
@@ -1103,7 +1117,7 @@ static void omap3_isp_snapshot_event(void *priv)
 
 	isp->ops->unwatch_fd(isp->snapshot.output->video->fd);
 
-	ret = v4l2_stream_off(isp->snapshot.output->video);
+	ret = omap3_isp_video_stop(isp->snapshot.output);
 	if (ret < 0) {
 		printf("error: streamoff failed for snapshot\n");
 		return;
@@ -1161,7 +1175,7 @@ int omap3_isp_snapshot_capture(struct omap3_isp_device *isp)
 	isp->ops->watch_fd(isp->snapshot.output->video->fd,
 			   OMAP3_ISP_EVENT_READ, omap3_isp_snapshot_event, isp);
 
-	ret = v4l2_stream_on(isp->snapshot.output->video);
+	ret = omap3_isp_video_start(isp->snapshot.output);
 	if (ret < 0) {
 		printf("error: streamon failed for snapshot\n");
 		return ret;