media: atomisp: cleanup ia_css_isp_configs() code

The auto-generated code inside ia_css_isp_configs() is more
complex than it should be. Also, it doesn't return any errors.

However, the functions called by it can mis-configure the pipelines,
but, as there's no way to return errors, it internally calls the
assert() macro.

So, add a return parameter to each routine there, in order to
prepare the code to be more robust.

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

diff --git a/drivers/staging/media/atomisp/pci/ia_css_isp_configs.c b/drivers/staging/media/atomisp/pci/ia_css_isp_configs.c
index 1a021ae..d28a76a 100644 (file)
--- a/drivers/staging/media/atomisp/pci/ia_css_isp_configs.c
+++ b/drivers/staging/media/atomisp/pci/ia_css_isp_configs.c
@@ -21,366 +21,301 @@
 #include "ia_css_debug.h"
 #include "assert_support.h"
 
-/* Code generated by genparam/genconfig.c:gen_configure_function() */
-
-void
-ia_css_configure_iterator(
-    const struct ia_css_binary *binary,
-    const struct ia_css_iterator_configuration *config_dmem)
+int ia_css_configure_iterator(const struct ia_css_binary *binary,
+                             const struct ia_css_iterator_configuration *config_dmem)
 {
-       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
-                           "ia_css_configure_iterator() enter:\n");
-
-       {
-               unsigned int offset = 0;
-               unsigned int size   = 0;
-
-               if (binary->info->mem_offsets.offsets.config) {
-                       size   = binary->info->mem_offsets.offsets.config->dmem.iterator.size;
-                       offset = binary->info->mem_offsets.offsets.config->dmem.iterator.offset;
-               }
-               if (size) {
-                       ia_css_iterator_config((struct sh_css_isp_iterator_isp_config *)
-                                              &binary->mem_params.params[IA_CSS_PARAM_CLASS_CONFIG][IA_CSS_ISP_DMEM].address[offset],
-                                              config_dmem, size);
-               }
-       }
-       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
-                           "ia_css_configure_iterator() leave:\n");
-}
+       unsigned int offset = 0;
+       unsigned int size   = 0;
 
-/* Code generated by genparam/genconfig.c:gen_configure_function() */
+       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "%s:\n", __func__);
 
-void
-ia_css_configure_copy_output(
-    const struct ia_css_binary *binary,
-    const struct ia_css_copy_output_configuration *config_dmem)
-{
-       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
-                           "ia_css_configure_copy_output() enter:\n");
-
-       {
-               unsigned int offset = 0;
-               unsigned int size   = 0;
-
-               if (binary->info->mem_offsets.offsets.config) {
-                       size   = binary->info->mem_offsets.offsets.config->dmem.copy_output.size;
-                       offset = binary->info->mem_offsets.offsets.config->dmem.copy_output.offset;
-               }
-               if (size) {
-                       ia_css_copy_output_config((struct sh_css_isp_copy_output_isp_config *)
-                                                 &binary->mem_params.params[IA_CSS_PARAM_CLASS_CONFIG][IA_CSS_ISP_DMEM].address[offset],
-                                                 config_dmem, size);
-               }
-       }
-       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
-                           "ia_css_configure_copy_output() leave:\n");
-}
+       if (!binary->info->mem_offsets.offsets.config)
+               return 0;
 
-/* Code generated by genparam/genconfig.c:gen_configure_function() */
+       size = binary->info->mem_offsets.offsets.config->dmem.iterator.size;
+       if (!size)
+               return 0;
 
-void
-ia_css_configure_crop(
-    const struct ia_css_binary *binary,
-    const struct ia_css_crop_configuration *config_dmem)
-{
-       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
-                           "ia_css_configure_crop() enter:\n");
-
-       {
-               unsigned int offset = 0;
-               unsigned int size   = 0;
-
-               if (binary->info->mem_offsets.offsets.config) {
-                       size   = binary->info->mem_offsets.offsets.config->dmem.crop.size;
-                       offset = binary->info->mem_offsets.offsets.config->dmem.crop.offset;
-               }
-               if (size) {
-                       ia_css_crop_config((struct sh_css_isp_crop_isp_config *)
-                                          &binary->mem_params.params[IA_CSS_PARAM_CLASS_CONFIG][IA_CSS_ISP_DMEM].address[offset],
-                                          config_dmem, size);
-               }
-       }
-       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
-                           "ia_css_configure_crop() leave:\n");
-}
+       offset = binary->info->mem_offsets.offsets.config->dmem.iterator.offset;
 
-/* Code generated by genparam/genconfig.c:gen_configure_function() */
+       ia_css_iterator_config((struct sh_css_isp_iterator_isp_config *)
+                              &binary->mem_params.params[IA_CSS_PARAM_CLASS_CONFIG][IA_CSS_ISP_DMEM].address[offset],
+                              config_dmem, size);
+       return 0;
+}
 
-void
-ia_css_configure_fpn(
-    const struct ia_css_binary *binary,
-    const struct ia_css_fpn_configuration *config_dmem)
+int ia_css_configure_copy_output(const struct ia_css_binary *binary,
+                                const struct ia_css_copy_output_configuration *config_dmem)
 {
-       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
-                           "ia_css_configure_fpn() enter:\n");
-
-       {
-               unsigned int offset = 0;
-               unsigned int size   = 0;
-
-               if (binary->info->mem_offsets.offsets.config) {
-                       size   = binary->info->mem_offsets.offsets.config->dmem.fpn.size;
-                       offset = binary->info->mem_offsets.offsets.config->dmem.fpn.offset;
-               }
-               if (size) {
-                       ia_css_fpn_config((struct sh_css_isp_fpn_isp_config *)
-                                         &binary->mem_params.params[IA_CSS_PARAM_CLASS_CONFIG][IA_CSS_ISP_DMEM].address[offset],
-                                         config_dmem, size);
-               }
-       }
-       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
-                           "ia_css_configure_fpn() leave:\n");
-}
+       unsigned int offset = 0;
+       unsigned int size   = 0;
 
-/* Code generated by genparam/genconfig.c:gen_configure_function() */
+       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "%s:\n", __func__);
 
-void
-ia_css_configure_dvs(
-    const struct ia_css_binary *binary,
-    const struct ia_css_dvs_configuration *config_dmem)
-{
-       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
-                           "ia_css_configure_dvs() enter:\n");
-
-       {
-               unsigned int offset = 0;
-               unsigned int size   = 0;
-
-               if (binary->info->mem_offsets.offsets.config) {
-                       size   = binary->info->mem_offsets.offsets.config->dmem.dvs.size;
-                       offset = binary->info->mem_offsets.offsets.config->dmem.dvs.offset;
-               }
-               if (size) {
-                       ia_css_dvs_config((struct sh_css_isp_dvs_isp_config *)
-                                         &binary->mem_params.params[IA_CSS_PARAM_CLASS_CONFIG][IA_CSS_ISP_DMEM].address[offset],
-                                         config_dmem, size);
-               }
-       }
-       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
-                           "ia_css_configure_dvs() leave:\n");
+       if (!binary->info->mem_offsets.offsets.config)
+               return 0;
+
+       size = binary->info->mem_offsets.offsets.config->dmem.copy_output.size;
+       if (!size)
+               return 0;
+
+       offset = binary->info->mem_offsets.offsets.config->dmem.copy_output.offset;
+
+       ia_css_copy_output_config((struct sh_css_isp_copy_output_isp_config *)
+                                 &binary->mem_params.params[IA_CSS_PARAM_CLASS_CONFIG][IA_CSS_ISP_DMEM].address[offset],
+                                 config_dmem, size);
+       return 0;
 }
 
 /* Code generated by genparam/genconfig.c:gen_configure_function() */
 
-void
-ia_css_configure_qplane(
-    const struct ia_css_binary *binary,
-    const struct ia_css_qplane_configuration *config_dmem)
+int ia_css_configure_crop(const struct ia_css_binary *binary,
+                         const struct ia_css_crop_configuration *config_dmem)
 {
-       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
-                           "ia_css_configure_qplane() enter:\n");
-
-       {
-               unsigned int offset = 0;
-               unsigned int size   = 0;
-
-               if (binary->info->mem_offsets.offsets.config) {
-                       size   = binary->info->mem_offsets.offsets.config->dmem.qplane.size;
-                       offset = binary->info->mem_offsets.offsets.config->dmem.qplane.offset;
-               }
-               if (size) {
-                       ia_css_qplane_config((struct sh_css_isp_qplane_isp_config *)
-                                            &binary->mem_params.params[IA_CSS_PARAM_CLASS_CONFIG][IA_CSS_ISP_DMEM].address[offset],
-                                            config_dmem, size);
-               }
-       }
-       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
-                           "ia_css_configure_qplane() leave:\n");
+       unsigned int offset = 0;
+       unsigned int size   = 0;
+
+       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "%s:\n", __func__);
+
+       if (!binary->info->mem_offsets.offsets.config)
+               return 0;
+
+       size = binary->info->mem_offsets.offsets.config->dmem.crop.size;
+       if (!size)
+               return 0;
+
+       offset = binary->info->mem_offsets.offsets.config->dmem.crop.offset;
+
+       ia_css_crop_config((struct sh_css_isp_crop_isp_config *)
+                          &binary->mem_params.params[IA_CSS_PARAM_CLASS_CONFIG][IA_CSS_ISP_DMEM].address[offset],
+                          config_dmem, size);
+       return 0;
 }
 
-/* Code generated by genparam/genconfig.c:gen_configure_function() */
+int ia_css_configure_fpn(const struct ia_css_binary *binary,
+                        const struct ia_css_fpn_configuration *config_dmem)
+{
+       unsigned int offset = 0;
+       unsigned int size   = 0;
+
+       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "%s:\n", __func__);
+
+       if (!binary->info->mem_offsets.offsets.config)
+               return 0;
+
+       size   = binary->info->mem_offsets.offsets.config->dmem.fpn.size;
+       if (!size)
+               return 0;
 
-void
-ia_css_configure_output0(
-    const struct ia_css_binary *binary,
-    const struct ia_css_output0_configuration *config_dmem)
+       offset = binary->info->mem_offsets.offsets.config->dmem.fpn.offset;
+       ia_css_fpn_config((struct sh_css_isp_fpn_isp_config *)
+                         &binary->mem_params.params[IA_CSS_PARAM_CLASS_CONFIG][IA_CSS_ISP_DMEM].address[offset],
+                         config_dmem, size);
+       return 0;
+}
+
+int ia_css_configure_dvs(const struct ia_css_binary *binary,
+                        const struct ia_css_dvs_configuration *config_dmem)
 {
-       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
-                           "ia_css_configure_output0() enter:\n");
-
-       {
-               unsigned int offset = 0;
-               unsigned int size   = 0;
-
-               if (binary->info->mem_offsets.offsets.config) {
-                       size   = binary->info->mem_offsets.offsets.config->dmem.output0.size;
-                       offset = binary->info->mem_offsets.offsets.config->dmem.output0.offset;
-               }
-               if (size) {
-                       ia_css_output0_config((struct sh_css_isp_output_isp_config *)
-                                             &binary->mem_params.params[IA_CSS_PARAM_CLASS_CONFIG][IA_CSS_ISP_DMEM].address[offset],
-                                             config_dmem, size);
-               }
-       }
-       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
-                           "ia_css_configure_output0() leave:\n");
+       unsigned int offset = 0;
+       unsigned int size   = 0;
+
+       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "%s:\n", __func__);
+
+       if (!binary->info->mem_offsets.offsets.config)
+               return 0;
+
+       size = binary->info->mem_offsets.offsets.config->dmem.dvs.size;
+       if (!size)
+               return 0;
+
+       offset = binary->info->mem_offsets.offsets.config->dmem.dvs.offset;
+       ia_css_dvs_config((struct sh_css_isp_dvs_isp_config *)
+                         &binary->mem_params.params[IA_CSS_PARAM_CLASS_CONFIG][IA_CSS_ISP_DMEM].address[offset],
+                         config_dmem, size);
+       return 0;
 }
 
-/* Code generated by genparam/genconfig.c:gen_configure_function() */
+int ia_css_configure_qplane(const struct ia_css_binary *binary,
+                           const struct ia_css_qplane_configuration *config_dmem)
+{
+       unsigned int offset = 0;
+       unsigned int size   = 0;
+
+       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "%s:\n", __func__);
+
+       if (!binary->info->mem_offsets.offsets.config)
+               return 0;
+
+       size = binary->info->mem_offsets.offsets.config->dmem.qplane.size;
+       if (!size)
+               return 0;
 
-void
-ia_css_configure_output1(
-    const struct ia_css_binary *binary,
-    const struct ia_css_output1_configuration *config_dmem)
+       offset = binary->info->mem_offsets.offsets.config->dmem.qplane.offset;
+       ia_css_qplane_config((struct sh_css_isp_qplane_isp_config *)
+                            &binary->mem_params.params[IA_CSS_PARAM_CLASS_CONFIG][IA_CSS_ISP_DMEM].address[offset],
+                            config_dmem, size);
+
+       return 0;
+}
+
+int ia_css_configure_output0(const struct ia_css_binary *binary,
+                            const struct ia_css_output0_configuration *config_dmem)
 {
-       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
-                           "ia_css_configure_output1() enter:\n");
-
-       {
-               unsigned int offset = 0;
-               unsigned int size   = 0;
-
-               if (binary->info->mem_offsets.offsets.config) {
-                       size   = binary->info->mem_offsets.offsets.config->dmem.output1.size;
-                       offset = binary->info->mem_offsets.offsets.config->dmem.output1.offset;
-               }
-               if (size) {
-                       ia_css_output1_config((struct sh_css_isp_output_isp_config *)
-                                             &binary->mem_params.params[IA_CSS_PARAM_CLASS_CONFIG][IA_CSS_ISP_DMEM].address[offset],
-                                             config_dmem, size);
-               }
-       }
-       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
-                           "ia_css_configure_output1() leave:\n");
+       unsigned int offset = 0;
+       unsigned int size   = 0;
+
+       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "%s:\n", __func__);
+
+       if (!binary->info->mem_offsets.offsets.config)
+               return 0;
+
+       size = binary->info->mem_offsets.offsets.config->dmem.output0.size;
+       if (!size)
+               return 0;
+
+       offset = binary->info->mem_offsets.offsets.config->dmem.output0.offset;
+
+       ia_css_output0_config((struct sh_css_isp_output_isp_config *)
+                             &binary->mem_params.params[IA_CSS_PARAM_CLASS_CONFIG][IA_CSS_ISP_DMEM].address[offset],
+                             config_dmem, size);
+       return 0;
 }
 
-/* Code generated by genparam/genconfig.c:gen_configure_function() */
+int ia_css_configure_output1(const struct ia_css_binary *binary,
+                            const struct ia_css_output1_configuration *config_dmem)
+{
+       unsigned int offset = 0;
+       unsigned int size   = 0;
+
+       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "%s:\n", __func__);
+
+       if (!binary->info->mem_offsets.offsets.config)
+               return 0;
+
+       size = binary->info->mem_offsets.offsets.config->dmem.output1.size;
+       if (!size)
+               return 0;
+
+       offset = binary->info->mem_offsets.offsets.config->dmem.output1.offset;
+
+       ia_css_output1_config((struct sh_css_isp_output_isp_config *)
+                             &binary->mem_params.params[IA_CSS_PARAM_CLASS_CONFIG][IA_CSS_ISP_DMEM].address[offset],
+                             config_dmem, size);
+       return 0;
+}
 
-void
-ia_css_configure_output(
-    const struct ia_css_binary *binary,
-    const struct ia_css_output_configuration *config_dmem)
+int ia_css_configure_output(const struct ia_css_binary *binary,
+                           const struct ia_css_output_configuration *config_dmem)
 {
-       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
-                           "ia_css_configure_output() enter:\n");
-
-       {
-               unsigned int offset = 0;
-               unsigned int size   = 0;
-
-               if (binary->info->mem_offsets.offsets.config) {
-                       size   = binary->info->mem_offsets.offsets.config->dmem.output.size;
-                       offset = binary->info->mem_offsets.offsets.config->dmem.output.offset;
-               }
-               if (size) {
-                       ia_css_output_config((struct sh_css_isp_output_isp_config *)
-                                            &binary->mem_params.params[IA_CSS_PARAM_CLASS_CONFIG][IA_CSS_ISP_DMEM].address[offset],
+       unsigned int offset = 0;
+       unsigned int size   = 0;
+
+       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "%s:\n", __func__);
+
+       if (!binary->info->mem_offsets.offsets.config)
+               return 0;
+
+       size = binary->info->mem_offsets.offsets.config->dmem.output.size;
+       if (!size)
+               return 0;
+
+       offset = binary->info->mem_offsets.offsets.config->dmem.output.offset;
+
+       ia_css_output_config((struct sh_css_isp_output_isp_config *)
+                            &binary->mem_params.params[IA_CSS_PARAM_CLASS_CONFIG][IA_CSS_ISP_DMEM].address[offset],
                                             config_dmem, size);
-               }
-       }
-       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
-                           "ia_css_configure_output() leave:\n");
+       return 0;
 }
 
-/* Code generated by genparam/genconfig.c:gen_configure_function() */
-
-void
-ia_css_configure_raw(
-    const struct ia_css_binary *binary,
-    const struct ia_css_raw_configuration *config_dmem)
+int ia_css_configure_raw(const struct ia_css_binary *binary,
+                        const struct ia_css_raw_configuration *config_dmem)
 {
-       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
-                           "ia_css_configure_raw() enter:\n");
-
-       {
-               unsigned int offset = 0;
-               unsigned int size   = 0;
-
-               if (binary->info->mem_offsets.offsets.config) {
-                       size   = binary->info->mem_offsets.offsets.config->dmem.raw.size;
-                       offset = binary->info->mem_offsets.offsets.config->dmem.raw.offset;
-               }
-               if (size) {
-                       ia_css_raw_config((struct sh_css_isp_raw_isp_config *)
-                                         &binary->mem_params.params[IA_CSS_PARAM_CLASS_CONFIG][IA_CSS_ISP_DMEM].address[offset],
-                                         config_dmem, size);
-               }
-       }
-       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
-                           "ia_css_configure_raw() leave:\n");
-}
+       unsigned int offset = 0;
+       unsigned int size   = 0;
 
-/* Code generated by genparam/genconfig.c:gen_configure_function() */
+       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "%s:\n", __func__);
 
-void
-ia_css_configure_tnr(
-    const struct ia_css_binary *binary,
-    const struct ia_css_tnr_configuration *config_dmem)
-{
-       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
-                           "ia_css_configure_tnr() enter:\n");
-
-       {
-               unsigned int offset = 0;
-               unsigned int size   = 0;
-
-               if (binary->info->mem_offsets.offsets.config) {
-                       size   = binary->info->mem_offsets.offsets.config->dmem.tnr.size;
-                       offset = binary->info->mem_offsets.offsets.config->dmem.tnr.offset;
-               }
-               if (size) {
-                       ia_css_tnr_config((struct sh_css_isp_tnr_isp_config *)
-                                         &binary->mem_params.params[IA_CSS_PARAM_CLASS_CONFIG][IA_CSS_ISP_DMEM].address[offset],
-                                         config_dmem, size);
-               }
-       }
-       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
-                           "ia_css_configure_tnr() leave:\n");
-}
+       if (!binary->info->mem_offsets.offsets.config)
+               return 0;
 
-/* Code generated by genparam/genconfig.c:gen_configure_function() */
+       size = binary->info->mem_offsets.offsets.config->dmem.raw.size;
+       if (!size)
+               return 0;
+
+       offset = binary->info->mem_offsets.offsets.config->dmem.raw.offset;
+
+       ia_css_raw_config((struct sh_css_isp_raw_isp_config *)
+                         &binary->mem_params.params[IA_CSS_PARAM_CLASS_CONFIG][IA_CSS_ISP_DMEM].address[offset],
+                         config_dmem, size);
+       return 0;
+}
 
-void
-ia_css_configure_ref(
-    const struct ia_css_binary *binary,
-    const struct ia_css_ref_configuration *config_dmem)
+int ia_css_configure_tnr(const struct ia_css_binary *binary,
+                        const struct ia_css_tnr_configuration *config_dmem)
 {
-       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
-                           "ia_css_configure_ref() enter:\n");
-
-       {
-               unsigned int offset = 0;
-               unsigned int size   = 0;
-
-               if (binary->info->mem_offsets.offsets.config) {
-                       size   = binary->info->mem_offsets.offsets.config->dmem.ref.size;
-                       offset = binary->info->mem_offsets.offsets.config->dmem.ref.offset;
-               }
-               if (size) {
-                       ia_css_ref_config((struct sh_css_isp_ref_isp_config *)
-                                         &binary->mem_params.params[IA_CSS_PARAM_CLASS_CONFIG][IA_CSS_ISP_DMEM].address[offset],
-                                         config_dmem, size);
-               }
-       }
-       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
-                           "ia_css_configure_ref() leave:\n");
+       unsigned int offset = 0;
+       unsigned int size   = 0;
+
+       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "%s:\n", __func__);
+
+       if (!binary->info->mem_offsets.offsets.config)
+               return 0;
+
+       size = binary->info->mem_offsets.offsets.config->dmem.tnr.size;
+       if (!size)
+               return 0;
+
+       offset = binary->info->mem_offsets.offsets.config->dmem.tnr.offset;
+
+       ia_css_tnr_config((struct sh_css_isp_tnr_isp_config *)
+                         &binary->mem_params.params[IA_CSS_PARAM_CLASS_CONFIG][IA_CSS_ISP_DMEM].address[offset],
+                         config_dmem, size);
+       return 0;
 }
 
-/* Code generated by genparam/genconfig.c:gen_configure_function() */
+int ia_css_configure_ref(const struct ia_css_binary *binary,
+                        const struct ia_css_ref_configuration *config_dmem)
+{
+       unsigned int offset = 0;
+       unsigned int size   = 0;
 
-void
-ia_css_configure_vf(
-    const struct ia_css_binary *binary,
-    const struct ia_css_vf_configuration *config_dmem)
+       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "%s:\n", __func__);
+
+       if (!binary->info->mem_offsets.offsets.config)
+               return 0;
+
+       size = binary->info->mem_offsets.offsets.config->dmem.ref.size;
+       if (!size)
+               return 0;
+
+       offset = binary->info->mem_offsets.offsets.config->dmem.ref.offset;
+
+       ia_css_ref_config((struct sh_css_isp_ref_isp_config *)
+                         &binary->mem_params.params[IA_CSS_PARAM_CLASS_CONFIG][IA_CSS_ISP_DMEM].address[offset],
+                         config_dmem, size);
+       return 0;
+}
+
+int ia_css_configure_vf(const struct ia_css_binary *binary,
+                       const struct ia_css_vf_configuration *config_dmem)
 {
-       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
-                           "ia_css_configure_vf() enter:\n");
-
-       {
-               unsigned int offset = 0;
-               unsigned int size   = 0;
-
-               if (binary->info->mem_offsets.offsets.config) {
-                       size   = binary->info->mem_offsets.offsets.config->dmem.vf.size;
-                       offset = binary->info->mem_offsets.offsets.config->dmem.vf.offset;
-               }
-               if (size) {
-                       ia_css_vf_config((struct sh_css_isp_vf_isp_config *)
-                                        &binary->mem_params.params[IA_CSS_PARAM_CLASS_CONFIG][IA_CSS_ISP_DMEM].address[offset],
-                                        config_dmem, size);
-               }
-       }
-       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
-                           "ia_css_configure_vf() leave:\n");
+       unsigned int offset = 0;
+       unsigned int size   = 0;
+
+       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "%s:\n", __func__);
+
+       if (!binary->info->mem_offsets.offsets.config)
+               return 0;
+
+       size = binary->info->mem_offsets.offsets.config->dmem.vf.size;
+       if (!size)
+               return 0;
+
+       offset = binary->info->mem_offsets.offsets.config->dmem.vf.offset;
+
+       ia_css_vf_config((struct sh_css_isp_vf_isp_config *)
+                        &binary->mem_params.params[IA_CSS_PARAM_CLASS_CONFIG][IA_CSS_ISP_DMEM].address[offset],
+                        config_dmem, size);
+       return 0;
 }

diff --git a/drivers/staging/media/atomisp/pci/ia_css_isp_configs.h b/drivers/staging/media/atomisp/pci/ia_css_isp_configs.h
index 0364b93..fffcfc8 100644 (file)
--- a/drivers/staging/media/atomisp/pci/ia_css_isp_configs.h
+++ b/drivers/staging/media/atomisp/pci/ia_css_isp_configs.h
@@ -27,14 +27,11 @@
 #include "isp/kernels/vf/vf_1.0/ia_css_vf.host.h"
 #include "isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.h"
 #include "isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output.host.h"
-#endif /* IA_CSS_INCLUDE_CONFIGURATIONS */
-/* Generated code: do not edit or commmit. */
+#endif
 
 #ifndef _IA_CSS_ISP_CONFIG_H
 #define _IA_CSS_ISP_CONFIG_H
 
-/* Code generated by genparam/gencode.c:gen_param_enum() */
-
 enum ia_css_configuration_ids {
        IA_CSS_ITERATOR_CONFIG_ID,
        IA_CSS_COPY_OUTPUT_CONFIG_ID,
@@ -56,8 +53,6 @@ enum ia_css_configuration_ids {
        IA_CSS_NUM_CONFIGURATION_IDS
 };
 
-/* Code generated by genparam/gencode.c:gen_param_offsets() */
-
 struct ia_css_config_memory_offsets {
        struct {
                struct ia_css_isp_parameter iterator;
@@ -80,96 +75,44 @@ struct ia_css_config_memory_offsets {
 
 #include "ia_css_stream.h"   /* struct ia_css_stream */
 #include "ia_css_binary.h"   /* struct ia_css_binary */
-/* Code generated by genparam/genconfig.c:gen_configure_function() */
-
-void
-ia_css_configure_iterator(
-    const struct ia_css_binary *binary,
-    const struct ia_css_iterator_configuration *config_dmem);
-
-/* Code generated by genparam/genconfig.c:gen_configure_function() */
-
-void
-ia_css_configure_copy_output(
-    const struct ia_css_binary *binary,
-    const struct ia_css_copy_output_configuration *config_dmem);
-
-/* Code generated by genparam/genconfig.c:gen_configure_function() */
-
-void
-ia_css_configure_crop(
-    const struct ia_css_binary *binary,
-    const struct ia_css_crop_configuration *config_dmem);
-
-/* Code generated by genparam/genconfig.c:gen_configure_function() */
-
-void
-ia_css_configure_fpn(
-    const struct ia_css_binary *binary,
-    const struct ia_css_fpn_configuration *config_dmem);
-
-/* Code generated by genparam/genconfig.c:gen_configure_function() */
-
-void
-ia_css_configure_dvs(
-    const struct ia_css_binary *binary,
-    const struct ia_css_dvs_configuration *config_dmem);
-
-/* Code generated by genparam/genconfig.c:gen_configure_function() */
-
-void
-ia_css_configure_qplane(
-    const struct ia_css_binary *binary,
-    const struct ia_css_qplane_configuration *config_dmem);
-
-/* Code generated by genparam/genconfig.c:gen_configure_function() */
-
-void
-ia_css_configure_output0(
-    const struct ia_css_binary *binary,
-    const struct ia_css_output0_configuration *config_dmem);
 
-/* Code generated by genparam/genconfig.c:gen_configure_function() */
+int ia_css_configure_iterator(const struct ia_css_binary *binary,
+                             const struct ia_css_iterator_configuration *config_dmem);
 
-void
-ia_css_configure_output1(
-    const struct ia_css_binary *binary,
-    const struct ia_css_output1_configuration *config_dmem);
+int ia_css_configure_copy_output(const struct ia_css_binary *binary,
+                                const struct ia_css_copy_output_configuration *config_dmem);
 
-/* Code generated by genparam/genconfig.c:gen_configure_function() */
+int ia_css_configure_crop(const struct ia_css_binary *binary,
+                         const struct ia_css_crop_configuration *config_dmem);
 
-void
-ia_css_configure_output(
-    const struct ia_css_binary *binary,
-    const struct ia_css_output_configuration *config_dmem);
+int ia_css_configure_fpn(const struct ia_css_binary *binary,
+                        const struct ia_css_fpn_configuration *config_dmem);
 
-/* Code generated by genparam/genconfig.c:gen_configure_function() */
+int ia_css_configure_dvs(const struct ia_css_binary *binary,
+                        const struct ia_css_dvs_configuration *config_dmem);
 
-void
-ia_css_configure_raw(
-    const struct ia_css_binary *binary,
-    const struct ia_css_raw_configuration *config_dmem);
+int ia_css_configure_qplane(const struct ia_css_binary *binary,
+                           const struct ia_css_qplane_configuration *config_dmem);
+int ia_css_configure_output0(const struct ia_css_binary *binary,
+                            const struct ia_css_output0_configuration *config_dmem);
 
-/* Code generated by genparam/genconfig.c:gen_configure_function() */
+int ia_css_configure_output1(const struct ia_css_binary *binary,
+                            const struct ia_css_output1_configuration *config_dmem);
 
-void
-ia_css_configure_tnr(
-    const struct ia_css_binary *binary,
-    const struct ia_css_tnr_configuration *config_dmem);
+int ia_css_configure_output(const struct ia_css_binary *binary,
+                           const struct ia_css_output_configuration *config_dmem);
 
-/* Code generated by genparam/genconfig.c:gen_configure_function() */
+int ia_css_configure_raw(const struct ia_css_binary *binary,
+                        const struct ia_css_raw_configuration *config_dmem);
 
-void
-ia_css_configure_ref(
-    const struct ia_css_binary *binary,
-    const struct ia_css_ref_configuration *config_dmem);
+int ia_css_configure_tnr(const struct ia_css_binary *binary,
+                        const struct ia_css_tnr_configuration *config_dmem);
 
-/* Code generated by genparam/genconfig.c:gen_configure_function() */
+int ia_css_configure_ref(const struct ia_css_binary *binary,
+                        const struct ia_css_ref_configuration *config_dmem);
 
-void
-ia_css_configure_vf(
-    const struct ia_css_binary *binary,
-    const struct ia_css_vf_configuration *config_dmem);
+int ia_css_configure_vf(const struct ia_css_binary *binary,
+                       const struct ia_css_vf_configuration *config_dmem);
 
 #endif /* IA_CSS_INCLUDE_CONFIGURATION */