media: atomisp: Drop atomisp_is_vf_pipe()

Since there only is one /dev/video# node now (no more continuous mode),
there are now no longer separate main capture + view-finder pipes.

We are now always on the main pipe, so atomisp_is_vf_pipe() should
always return false now. Drop any checks using it, replacing them
with the code-path for a false return.

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_cmd.c b/drivers/staging/media/atomisp/pci/atomisp_cmd.c
index faaa4f1..3d6e0d0 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_cmd.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_cmd.c
@@ -3216,9 +3216,6 @@ void atomisp_handle_parameter_and_buffer(struct atomisp_video_pipe *pipe)
 
        lockdep_assert_held(&asd->isp->mutex);
 
-       if (atomisp_is_vf_pipe(pipe))
-               return;
-
        /*
         * CSS/FW requires set parameter and enqueue buffer happen after ISP
         * is streamon.
@@ -3294,15 +3291,7 @@ int atomisp_set_parameters(struct video_device *vdev,
        dev_dbg(asd->isp->dev, "set parameter(per_frame_setting %d) isp_config_id %d of %s\n",
                arg->per_frame_setting, arg->isp_config_id, vdev->name);
 
-       if (IS_ISP2401) {
-               if (atomisp_is_vf_pipe(pipe) && arg->per_frame_setting) {
-                       dev_err(asd->isp->dev, "%s: vf pipe not support per_frame_setting",
-                               __func__);
-                       return -EINVAL;
-               }
-       }
-
-       if (arg->per_frame_setting && !atomisp_is_vf_pipe(pipe)) {
+       if (arg->per_frame_setting) {
                /*
                 * Per-frame setting enabled, we allocate a new parameter
                 * buffer to cache the parameters and only when frame buffers
@@ -3341,7 +3330,7 @@ int atomisp_set_parameters(struct video_device *vdev,
        if (ret)
                goto apply_parameter_failed;
 
-       if (!(arg->per_frame_setting && !atomisp_is_vf_pipe(pipe))) {
+       if (!arg->per_frame_setting) {
                /* indicate to CSS that we have parameters to be updated */
                asd->params.css_update_params_needed = true;
        } else {
@@ -4780,23 +4769,6 @@ int atomisp_flash_enable(struct atomisp_sub_device *asd, int num_frames)
        return 0;
 }
 
-bool atomisp_is_vf_pipe(struct atomisp_video_pipe *pipe)
-{
-       struct atomisp_sub_device *asd = pipe->asd;
-
-       if (!asd) {
-               dev_err(pipe->isp->dev, "%s(): asd is NULL, device is %s\n",
-                       __func__, pipe->vdev.name);
-               return false;
-       }
-
-       if (asd->run_mode->val == ATOMISP_RUN_MODE_VIDEO &&
-           pipe == &asd->video_out_preview)
-               return true;
-
-       return false;
-}
-
 static int __checking_exp_id(struct atomisp_sub_device *asd, int exp_id)
 {
        struct atomisp_device *isp = asd->isp;

diff --git a/drivers/staging/media/atomisp/pci/atomisp_cmd.h b/drivers/staging/media/atomisp/pci/atomisp_cmd.h
index 3cf086e..cbe2f48 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_cmd.h
+++ b/drivers/staging/media/atomisp/pci/atomisp_cmd.h
@@ -291,8 +291,6 @@ void atomisp_eof_event(struct atomisp_sub_device *asd, uint8_t exp_id);
 enum mipi_port_id __get_mipi_port(struct atomisp_device *isp,
                                  enum atomisp_camera_port port);
 
-bool atomisp_is_vf_pipe(struct atomisp_video_pipe *pipe);
-
 void atomisp_apply_css_parameters(
     struct atomisp_sub_device *asd,
     struct atomisp_css_params *css_param);

diff --git a/drivers/staging/media/atomisp/pci/atomisp_fops.c b/drivers/staging/media/atomisp/pci/atomisp_fops.c
index 3adeeb9..99152db 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_fops.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_fops.c
@@ -403,9 +403,8 @@ static void atomisp_buf_queue(struct vb2_buffer *vb)
         *     is put to waiting list until previous per-frame parameter buffers
         *     get enqueued.
         */
-       if (!atomisp_is_vf_pipe(pipe) &&
-           (pipe->frame_request_config_id[vb->index] ||
-            !list_empty(&pipe->buffers_waiting_for_param)))
+       if (pipe->frame_request_config_id[vb->index] ||
+           !list_empty(&pipe->buffers_waiting_for_param))
                list_add_tail(&frame->queue, &pipe->buffers_waiting_for_param);
        else
                list_add_tail(&frame->queue, &pipe->activeq);

diff --git a/drivers/staging/media/atomisp/pci/atomisp_ioctl.c b/drivers/staging/media/atomisp/pci/atomisp_ioctl.c
index 392c0ed..3068f1a 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_ioctl.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_ioctl.c
@@ -1045,8 +1045,7 @@ static int atomisp_qbuf_wrapper(struct file *file, void *fh, struct v4l2_buffer
        if (buf->index >= vdev->queue->num_buffers)
                return -EINVAL;
 
-       if (!atomisp_is_vf_pipe(pipe) &&
-           (buf->reserved2 & ATOMISP_BUFFER_HAS_PER_FRAME_SETTING)) {
+       if (buf->reserved2 & ATOMISP_BUFFER_HAS_PER_FRAME_SETTING) {
                /* this buffer will have a per-frame parameter */
                pipe->frame_request_config_id[buf->index] = buf->reserved2 &
                        ~ATOMISP_BUFFER_HAS_PER_FRAME_SETTING;