media: atomisp: move ia_css_configure_sc() implementation

With the changes, this function is now undefined if built
for ISP2400. So, move its implementation to the file which
calls it.

Reported-by: Francescodario Cuzzocrea <francescodario.cuzzocrea@mail.polimi.it>
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_configs.c b/drivers/staging/media/atomisp/pci/css_2401_system/hive/ia_css_isp_configs.c
index cd37e7e3d7796107b7b81336c51b2ce3dc43d87f..29d85407cac474fe268c7190c858e7e6a37e088e 100644 (file)
--- a/drivers/staging/media/atomisp/pci/css_2401_system/hive/ia_css_isp_configs.c
+++ b/drivers/staging/media/atomisp/pci/css_2401_system/hive/ia_css_isp_configs.c
@@ -272,33 +272,6 @@ ia_css_configure_output(
                            "ia_css_configure_output() leave:\n");
 }
 
-/* Code generated by genparam/genconfig.c:gen_configure_function() */
-
-void
-ia_css_configure_sc(
-    const struct ia_css_binary *binary,
-    const struct ia_css_sc_configuration *config_dmem)
-{
-       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
-                           "ia_css_configure_sc() 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.sc.size;
-                       offset = binary->info->mem_offsets.offsets.config->dmem.sc.offset;
-               }
-               if (size) {
-                       ia_css_sc_config((struct sh_css_isp_sc_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_sc() leave:\n");
-}
 
 /* Code generated by genparam/genconfig.c:gen_configure_function() */
 

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 6dd0205fa59e704338414c88cf87471e421fc8ce..6545efd24cbecdee2c62e9f092f568d2fad6f95a 100644 (file)
--- a/drivers/staging/media/atomisp/pci/ia_css_isp_configs.h
+++ b/drivers/staging/media/atomisp/pci/ia_css_isp_configs.h
@@ -152,14 +152,6 @@ ia_css_configure_output(
 
 /* Code generated by genparam/genconfig.c:gen_configure_function() */
 
-/* ISP2401 */
-void
-ia_css_configure_sc(
-    const struct ia_css_binary *binary,
-    const struct ia_css_sc_configuration *config_dmem);
-
-/* Code generated by genparam/genconfig.c:gen_configure_function() */
-
 void
 ia_css_configure_raw(
     const struct ia_css_binary *binary,

diff --git a/drivers/staging/media/atomisp/pci/isp/kernels/sc/sc_1.0/ia_css_sc.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/sc/sc_1.0/ia_css_sc.host.c
index 000cbe600f972c44fd15460dd19ead8d82a08717..43954ed6d10632f25139a7a8cfc730c70b2452e7 100644 (file)
--- a/drivers/staging/media/atomisp/pci/isp/kernels/sc/sc_1.0/ia_css_sc.host.c
+++ b/drivers/staging/media/atomisp/pci/isp/kernels/sc/sc_1.0/ia_css_sc.host.c
@@ -22,6 +22,35 @@
 
 #include "ia_css_sc.host.h"
 
+/* Code generated by genparam/genconfig.c:gen_configure_function() */
+
+/* ISP2401 */
+static void
+ia_css_configure_sc(
+    const struct ia_css_binary *binary,
+    const struct ia_css_sc_configuration *config_dmem)
+{
+       ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
+                           "ia_css_configure_sc() 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.sc.size;
+                       offset = binary->info->mem_offsets.offsets.config->dmem.sc.offset;
+               }
+               if (size) {
+                       ia_css_sc_config((struct sh_css_isp_sc_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_sc() leave:\n");
+}
+
 void
 ia_css_sc_encode(
     struct sh_css_isp_sc_params *to,