]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
media: staging: media: atomisp: Remove unnecessary if statement
authorAlex Dewar <alex.dewar90@gmail.com>
Sat, 17 Oct 2020 14:28:02 +0000 (16:28 +0200)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Mon, 22 Mar 2021 16:46:08 +0000 (17:46 +0100)
The bodies of the if and else sections are the same, so just remove the
check.

Link: https://lore.kernel.org/linux-media/20201017142810.26967-2-alex.dewar90@gmail.com
Signed-off-by: Alex Dewar <alex.dewar90@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/staging/media/atomisp/pci/atomisp_cmd.c

index 592ea990d4ca4014b72a7666d5be077e7b888280..92ddce409d0479b895308b530ec310164adee0be 100644 (file)
@@ -5407,27 +5407,12 @@ static int atomisp_set_fmt_to_isp(struct video_device *vdev,
                return -EINVAL;
        }
 
-       if (asd->continuous_mode->val &&
-           (configure_pp_input == atomisp_css_preview_configure_pp_input ||
-            configure_pp_input == atomisp_css_video_configure_pp_input)) {
-               /* for isp 2.2, configure pp input is available for continuous
-                * mode */
-               ret = configure_pp_input(asd, isp_sink_crop->width,
-                                        isp_sink_crop->height);
-               if (ret) {
-                       dev_err(isp->dev, "configure_pp_input %ux%u\n",
-                               isp_sink_crop->width,
-                               isp_sink_crop->height);
-                       return -EINVAL;
-               }
-       } else {
-               ret = configure_pp_input(asd, isp_sink_crop->width,
-                                        isp_sink_crop->height);
-               if (ret) {
-                       dev_err(isp->dev, "configure_pp_input %ux%u\n",
-                               isp_sink_crop->width, isp_sink_crop->height);
-                       return -EINVAL;
-               }
+       ret = configure_pp_input(asd, isp_sink_crop->width, isp_sink_crop->height);
+       if (ret) {
+               dev_err(isp->dev, "configure_pp_input %ux%u\n",
+                       isp_sink_crop->width,
+                       isp_sink_crop->height);
+               return -EINVAL;
        }
        if (asd->copy_mode)
                ret = atomisp_css_copy_get_output_frame_info(asd, stream_index,