media: atomisp: drop two vars that are currently ignored

Those two vars are meaningful only with some ISP2401 firmwares.
The one we chose to support doesn't use, so simply drop the
extra code.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/staging/media/atomisp/pci/runtime/pipeline/src/pipeline.c b/drivers/staging/media/atomisp/pci/runtime/pipeline/src/pipeline.c
index d03957d1ecf48ba10d7a20f7bf0fd36893d6d95e..dfc50247ea8ee30c3b9417a3c9215fb527341cc8 100644 (file)
--- a/drivers/staging/media/atomisp/pci/runtime/pipeline/src/pipeline.c
+++ b/drivers/staging/media/atomisp/pci/runtime/pipeline/src/pipeline.c
@@ -140,8 +140,7 @@ void ia_css_pipeline_start(enum ia_css_pipe_id pipe_id,
                                false, false, false, true, SH_CSS_BDS_FACTOR_1_00,
                                SH_CSS_PIPE_CONFIG_OVRD_NO_OVRD,
                                IA_CSS_INPUT_MODE_MEMORY, NULL, NULL,
-                               (enum mipi_port_id)0,
-                               NULL, NULL);
+                               (enum mipi_port_id)0);
 
        ia_css_pipeline_get_sp_thread_id(pipe_num, &thread_id);
        if (!sh_css_sp_is_running()) {

diff --git a/drivers/staging/media/atomisp/pci/sh_css.c b/drivers/staging/media/atomisp/pci/sh_css.c
index ac3519d08971bcbfb2f6cb966fa157eb9ef983f0..3aa4f8bc39c4d39547aef9e2ee993b45c29f5e1d 100644 (file)
--- a/drivers/staging/media/atomisp/pci/sh_css.c
+++ b/drivers/staging/media/atomisp/pci/sh_css.c
@@ -1426,20 +1426,11 @@ static void start_pipe(
     enum sh_css_pipe_config_override copy_ovrd,
     enum ia_css_input_mode input_mode)
 {
-       const struct ia_css_coordinate *coord = NULL;
-       const struct ia_css_isp_parameters *params = NULL;
-
-
        IA_CSS_ENTER_PRIVATE("me = %p, copy_ovrd = %d, input_mode = %d",
                             me, copy_ovrd, input_mode);
 
        assert(me); /* all callers are in this file and call with non null argument */
 
-       if (IS_ISP2401) {
-               coord = &me->config.internal_frame_origin_bqs_on_sctbl;
-               params = me->stream->isp_params_configs;
-       }
-
        sh_css_sp_init_pipeline(&me->pipeline,
                                me->mode,
                                (uint8_t)ia_css_pipe_get_pipe_num(me),
@@ -1454,9 +1445,7 @@ static void start_pipe(
                                &me->stream->info.metadata_info
                                , (input_mode == IA_CSS_INPUT_MODE_MEMORY) ?
                                (enum mipi_port_id)0 :
-                               me->stream->config.source.port.port,
-                               coord,
-                               params);
+                               me->stream->config.source.port.port);
 
        if (me->config.mode != IA_CSS_PIPE_MODE_COPY) {
                struct ia_css_pipeline_stage *stage;
@@ -3882,8 +3871,6 @@ preview_start(struct ia_css_pipe *pipe)
        struct ia_css_pipe *acc_pipe;
        enum sh_css_pipe_config_override copy_ovrd;
        enum ia_css_input_mode preview_pipe_input_mode;
-       const struct ia_css_coordinate *coord = NULL;
-       const struct ia_css_isp_parameters *params = NULL;
        unsigned int thread_id;
 
        IA_CSS_ENTER_PRIVATE("pipe = %p", pipe);
@@ -3913,15 +3900,10 @@ preview_start(struct ia_css_pipe *pipe)
 
        if (pipe->stream->cont_capt) {
                ia_css_pipeline_get_sp_thread_id(ia_css_pipe_get_pipe_num(capture_pipe),
-                                                   &thread_id);
+                                                &thread_id);
                copy_ovrd |= 1 << thread_id;
        }
 
-       if (IS_ISP2401) {
-               coord = &pipe->config.internal_frame_origin_bqs_on_sctbl;
-               params = pipe->stream->isp_params_configs;
-       }
-
        /* Construct and load the copy pipe */
        if (pipe->stream->config.continuous) {
                sh_css_sp_init_pipeline(&copy_pipe->pipeline,
@@ -3934,9 +3916,7 @@ preview_start(struct ia_css_pipe *pipe)
                                        pipe->stream->config.mode,
                                        &pipe->stream->config.metadata_config,
                                        &pipe->stream->info.metadata_info,
-                                       pipe->stream->config.source.port.port,
-                                       coord,
-                                       params);
+                                       pipe->stream->config.source.port.port);
 
                /*
                 * make the preview pipe start with mem mode input, copy handles
@@ -3959,9 +3939,7 @@ preview_start(struct ia_css_pipe *pipe)
                                        IA_CSS_INPUT_MODE_MEMORY,
                                        &pipe->stream->config.metadata_config,
                                        &pipe->stream->info.metadata_info,
-                                       (enum mipi_port_id)0,
-                                       coord,
-                                       params);
+                                       (enum mipi_port_id)0);
        }
 
        if (acc_pipe) {
@@ -3977,9 +3955,7 @@ preview_start(struct ia_css_pipe *pipe)
                                        IA_CSS_INPUT_MODE_MEMORY,
                                        NULL,
                                        NULL,
-                                       (enum mipi_port_id)0,
-                                       coord,
-                                       params);
+                                       (enum mipi_port_id)0);
        }
 
        start_pipe(pipe, copy_ovrd, preview_pipe_input_mode);
@@ -5650,8 +5626,6 @@ static int video_start(struct ia_css_pipe *pipe)
        struct ia_css_pipe *copy_pipe, *capture_pipe;
        enum sh_css_pipe_config_override copy_ovrd;
        enum ia_css_input_mode video_pipe_input_mode;
-       const struct ia_css_coordinate *coord = NULL;
-       const struct ia_css_isp_parameters *params = NULL;
        unsigned int thread_id;
 
        IA_CSS_ENTER_PRIVATE("pipe = %p", pipe);
@@ -5684,11 +5658,6 @@ static int video_start(struct ia_css_pipe *pipe)
                copy_ovrd |= 1 << thread_id;
        }
 
-       if (IS_ISP2401) {
-               coord = &pipe->config.internal_frame_origin_bqs_on_sctbl;
-               params = pipe->stream->isp_params_configs;
-       }
-
        /* Construct and load the copy pipe */
        if (pipe->stream->config.continuous) {
                sh_css_sp_init_pipeline(&copy_pipe->pipeline,
@@ -5701,9 +5670,7 @@ static int video_start(struct ia_css_pipe *pipe)
                                        pipe->stream->config.mode,
                                        &pipe->stream->config.metadata_config,
                                        &pipe->stream->info.metadata_info,
-                                       pipe->stream->config.source.port.port,
-                                       coord,
-                                       params);
+                                       pipe->stream->config.source.port.port);
 
                /*
                 * make the video pipe start with mem mode input, copy handles
@@ -5726,9 +5693,7 @@ static int video_start(struct ia_css_pipe *pipe)
                                        IA_CSS_INPUT_MODE_MEMORY,
                                        &pipe->stream->config.metadata_config,
                                        &pipe->stream->info.metadata_info,
-                                       (enum mipi_port_id)0,
-                                       coord,
-                                       params);
+                                       (enum mipi_port_id)0);
        }
 
        start_pipe(pipe, copy_ovrd, video_pipe_input_mode);

diff --git a/drivers/staging/media/atomisp/pci/sh_css_sp.c b/drivers/staging/media/atomisp/pci/sh_css_sp.c
index 77ac720017a2ff1fa0af903c2c20412c64de8228..ff7c2c5fd94dc0a7cc2ce1825d429b1bba718c4e 100644 (file)
--- a/drivers/staging/media/atomisp/pci/sh_css_sp.c
+++ b/drivers/staging/media/atomisp/pci/sh_css_sp.c
@@ -1217,12 +1217,7 @@ sh_css_sp_init_pipeline(struct ia_css_pipeline *me,
                        enum ia_css_input_mode input_mode,
                        const struct ia_css_metadata_config *md_config,
                        const struct ia_css_metadata_info *md_info,
-                       const enum mipi_port_id port_id,
-                       const struct ia_css_coordinate
-                       *internal_frame_origin_bqs_on_sctbl, /* Origin of internal frame
-                                                       positioned on shading table at shading correction in ISP. */
-                       const struct ia_css_isp_parameters *params
-                      )
+                       const enum mipi_port_id port_id)
 {
        /* Get first stage */
        struct ia_css_pipeline_stage *stage        = NULL;

diff --git a/drivers/staging/media/atomisp/pci/sh_css_sp.h b/drivers/staging/media/atomisp/pci/sh_css_sp.h
index 832eed71152588768a204cea48e1dc095ce9e638..f69a79b0b0dad0fe83b0d8b51b61b14ae18347f7 100644 (file)
--- a/drivers/staging/media/atomisp/pci/sh_css_sp.h
+++ b/drivers/staging/media/atomisp/pci/sh_css_sp.h
@@ -66,12 +66,7 @@ sh_css_sp_init_pipeline(struct ia_css_pipeline *me,
                        enum ia_css_input_mode input_mode,
                        const struct ia_css_metadata_config *md_config,
                        const struct ia_css_metadata_info *md_info,
-                       const enum mipi_port_id port_id,
-                       const struct ia_css_coordinate
-                       *internal_frame_origin_bqs_on_sctbl, /* Origin of internal frame
-                                                       positioned on shading table at shading correction in ISP. */
-                       const struct ia_css_isp_parameters *params
-                      );
+                       const enum mipi_port_id port_id);
 
 void
 sh_css_sp_uninit_pipeline(unsigned int pipe_num);