media: atomisp: Remove atomisp_sensor_start_stream()

Now that we no longer have continuous mode we always want to
start the sensor on the first atomisp_start_streaming() call
and stop it on the first atomisp_stop_streaming() call.

Remove atomisp_sensor_start_stream() which returned the number
of streams which should be active before starting the sensor
and always start/stop the sensor directly.

Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/staging/media/atomisp/pci/atomisp_ioctl.c b/drivers/staging/media/atomisp/pci/atomisp_ioctl.c
index e0a8616ecf05010d8fb8a8bf1924be573f0e650f..13e00a2af8e1b5b2b6bf49074b79ea14158ab25d 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_ioctl.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_ioctl.c
@@ -1123,20 +1123,6 @@ enum ia_css_pipe_id atomisp_get_css_pipe_id(struct atomisp_sub_device *asd)
        }
 }
 
-static unsigned int atomisp_sensor_start_stream(struct atomisp_sub_device *asd)
-{
-       if (asd->vfpp->val != ATOMISP_VFPP_ENABLE ||
-           asd->copy_mode)
-               return 1;
-
-       if (asd->run_mode->val == ATOMISP_RUN_MODE_VIDEO ||
-           (asd->run_mode->val == ATOMISP_RUN_MODE_STILL_CAPTURE &&
-            !atomisp_is_mbuscode_raw(asd->fmt[ATOMISP_SUBDEV_PAD_SOURCE].fmt.code)))
-               return 2;
-       else
-               return 1;
-}
-
 /* Input system HW workaround */
 /* Input system address translation corrupts burst during */
 /* invalidate. SW workaround for this is to set burst length */
@@ -1162,7 +1148,6 @@ int atomisp_start_streaming(struct vb2_queue *vq, unsigned int count)
        struct atomisp_device *isp = asd->isp;
        struct pci_dev *pdev = to_pci_dev(isp->dev);
        enum ia_css_pipe_id css_pipe_id;
-       unsigned int sensor_start_stream;
        unsigned long irqflags;
        int ret;
 
@@ -1177,18 +1162,6 @@ int atomisp_start_streaming(struct vb2_queue *vq, unsigned int count)
        /* Input system HW workaround */
        atomisp_dma_burst_len_cfg(asd);
 
-       /*
-        * The number of streaming video nodes is based on which
-        * binary is going to be run.
-        */
-       sensor_start_stream = atomisp_sensor_start_stream(asd);
-
-       if (atomisp_subdev_streaming_count(asd) > sensor_start_stream) {
-               atomisp_qbuffers_to_css(asd);
-               ret = 0;
-               goto out_unlock;
-       }
-
        if (asd->streaming == ATOMISP_DEVICE_STREAMING_ENABLED) {
                atomisp_qbuffers_to_css(asd);
                goto start_sensor;
@@ -1233,12 +1206,6 @@ int atomisp_start_streaming(struct vb2_queue *vq, unsigned int count)
 
        atomisp_qbuffers_to_css(asd);
 
-       /* Only start sensor when the last streaming instance started */
-       if (atomisp_subdev_streaming_count(asd) < sensor_start_stream) {
-               ret = 0;
-               goto out_unlock;
-       }
-
 start_sensor:
        if (isp->flash) {
                asd->params.num_flash_frames = 0;
@@ -1340,9 +1307,6 @@ void atomisp_stop_streaming(struct vb2_queue *vq)
 
        atomisp_subdev_cleanup_pending_events(asd);
 stopsensor:
-       if (atomisp_subdev_streaming_count(asd) != atomisp_sensor_start_stream(asd))
-               goto out_unlock;
-
        ret = v4l2_subdev_call(isp->inputs[asd->input_curr].camera,
                               video, s_stream, 0);