media: atomisp: remove struct ia_css_isp_parameter xnr3

This patch removes `struct ia_css_isp_parameter xnr3` from
`struct ia_css_memory_offsets` as well as its usage [1].

[1] added on updating css version to irci_master_20150701_0213
    https://raw.githubusercontent.com/intel/ProductionKernelQuilts/cht-m1stable-2016_ww31/uefi/cht-m1stable/patches/cam-0439-atomisp2-css2401-and-2401_legacy-irci_master_2015070.patch
    ("atomisp2: css2401 and 2401_legacy-irci_master_20150701_0213")

Signed-off-by: Tsuchiya Yuto <kitakar@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/staging/media/atomisp/pci/css_2401_system/hive/ia_css_isp_params.c b/drivers/staging/media/atomisp/pci/css_2401_system/hive/ia_css_isp_params.c
index d9c672d8904e7d71502059acea27067873de7dd7..503ac65da69b91fd6d906a5226b232baee3e27d9 100644 (file)
--- a/drivers/staging/media/atomisp/pci/css_2401_system/hive/ia_css_isp_params.c
+++ b/drivers/staging/media/atomisp/pci/css_2401_system/hive/ia_css_isp_params.c
@@ -1721,29 +1721,6 @@ ia_css_process_xnr3(
                                            "ia_css_process_xnr3() leave:\n");
                }
        }
-       {
-               unsigned int size   =
-                   stage->binary->info->mem_offsets.offsets.param->vmem.xnr3.size;
-
-               unsigned int offset =
-                   stage->binary->info->mem_offsets.offsets.param->vmem.xnr3.offset;
-
-               if (size) {
-                       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
-                                           "ia_css_process_xnr3() enter:\n");
-
-                       ia_css_xnr3_vmem_encode((struct sh_css_isp_xnr3_vmem_params *)
-                                               &stage->binary->mem_params.params[IA_CSS_PARAM_CLASS_PARAM][IA_CSS_ISP_VMEM].address[offset],
-                                               &params->xnr3_config,
-                                               size);
-                       params->isp_params_changed = true;
-                       params->isp_mem_params_changed[pipe_id][stage->stage_num][IA_CSS_ISP_VMEM] =
-                           true;
-
-                       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
-                                           "ia_css_process_xnr3() leave:\n");
-               }
-       }
 }
 
 /* Code generated by genparam/gencode.c:gen_param_process_table() */

diff --git a/drivers/staging/media/atomisp/pci/ia_css_isp_params.h b/drivers/staging/media/atomisp/pci/ia_css_isp_params.h
index 6e3082b39ed64639fefca7fed6fcc8eaed1f8861..c2de689877d1529774d4351cc9e381cd0250c75d 100644 (file)
--- a/drivers/staging/media/atomisp/pci/ia_css_isp_params.h
+++ b/drivers/staging/media/atomisp/pci/ia_css_isp_params.h
@@ -121,9 +121,6 @@ struct ia_css_memory_offsets {
                struct ia_css_isp_parameter sdis_vertcoef;
                struct ia_css_isp_parameter sdis2_horicoef;
                struct ia_css_isp_parameter sdis2_vertcoef;
-
-               /* ISP2401 */
-               struct ia_css_isp_parameter xnr3;
        } vmem;
        struct {
                struct ia_css_isp_parameter bh;