[media] atomisp2: tidy up confused ifdefs

The two drivers were machine merged and in this case the machine output was to
say the least not optimal.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c
index 231c3f8b535e0f82cf88ad40f1a338287ac148a0..8d44608b39a03c4b98b4e4bf7aa886966ef534c6 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c
@@ -1469,30 +1469,17 @@ static void start_pipe(
                                copy_ovrd,
                                input_mode,
                                &me->stream->config.metadata_config,
-#ifndef ISP2401
                                &me->stream->info.metadata_info
-#else
-                               &me->stream->info.metadata_info,
-#endif
 #if !defined(HAS_NO_INPUT_SYSTEM)
-#ifndef ISP2401
-                               , (input_mode==IA_CSS_INPUT_MODE_MEMORY)?
-#else
-                               (input_mode == IA_CSS_INPUT_MODE_MEMORY) ?
-#endif
+                               ,(input_mode==IA_CSS_INPUT_MODE_MEMORY) ?
                                        (mipi_port_ID_t)0 :
-#ifndef ISP2401
                                        me->stream->config.source.port.port
-#else
-                                       me->stream->config.source.port.port,
 #endif
+#ifdef ISP2401
+                               ,&me->config.internal_frame_origin_bqs_on_sctbl,
+                               me->stream->isp_params_configs
 #endif
-#ifndef ISP2401
-                               );
-#else
-                               &me->config.internal_frame_origin_bqs_on_sctbl,
-                               me->stream->isp_params_configs);
-#endif
+                       );
 
        if (me->config.mode != IA_CSS_PIPE_MODE_COPY) {
                struct ia_css_pipeline_stage *stage;
@@ -9815,9 +9802,6 @@ ia_css_stream_create(const struct ia_css_stream_config *stream_config,
                /* take over effective info */
 
                effective_res = curr_pipe->config.input_effective_res;
-#endif
-
-#ifndef ISP2401
                err = ia_css_util_check_res(
                                        effective_res.width,
                                        effective_res.height);