kconfig: rename file_write_dep and move it to confdata.c

file_write_dep() is called only from conf_write_autoconf().
Move it from util.c to confdata.c to make it static.
Also, rename it to conf_write_dep() since it should belong to
the group of conf_write* functions.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

3 files changed, 30 insertions, 32 deletions

diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 629ad32d4708..c553f1f30c36 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -818,6 +818,35 @@ next:
         return 0;
 }
 
+/* write a dependency file as used by kbuild to track dependencies */
+static int conf_write_dep(const char *name)
+{
+        struct file *file;
+        FILE *out;
+
+        if (!name)
+                name = ".kconfig.d";
+        out = fopen("..config.tmp", "w");
+        if (!out)
+                return 1;
+        fprintf(out, "deps_config := \\\n");
+        for (file = file_list; file; file = file->next) {
+                if (file->next)
+                        fprintf(out, "\t%s \\\n", file->name);
+                else
+                        fprintf(out, "\t%s\n", file->name);
+        }
+        fprintf(out, "\n%s: \\\n"
+                     "\t$(deps_config)\n\n", conf_get_autoconfig_name());
+
+        env_write_dep(out, conf_get_autoconfig_name());
+
+        fprintf(out, "\n$(deps_config): ;\n");
+        fclose(out);
+        rename("..config.tmp", name);
+        return 0;
+}
+
 static int conf_split_config(void)
 {
         const char *name;
@@ -940,7 +969,7 @@ int conf_write_autoconf(void)
 
         sym_clear_all_valid();
 
-        file_write_dep("include/config/auto.conf.cmd");
+        conf_write_dep("include/config/auto.conf.cmd");
 
         if (conf_split_config())
                 return 1;
diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
index ed3ff88e60ba..6b7bbc6238e3 100644
--- a/scripts/kconfig/lkc.h
+++ b/scripts/kconfig/lkc.h
@@ -97,7 +97,6 @@ void menu_set_type(int type);
 
 /* util.c */
 struct file *file_lookup(const char *name);
-int file_write_dep(const char *name);
 void *xmalloc(size_t size);
 void *xcalloc(size_t nmemb, size_t size);
 void *xrealloc(void *p, size_t size);
diff --git a/scripts/kconfig/util.c b/scripts/kconfig/util.c
index a365594770d9..d999683bb2a7 100644
--- a/scripts/kconfig/util.c
+++ b/scripts/kconfig/util.c
@@ -29,36 +29,6 @@ struct file *file_lookup(const char *name)
         return file;
 }
 
-/* write a dependency file as used by kbuild to track dependencies */
-int file_write_dep(const char *name)
-{
-        struct file *file;
-        FILE *out;
-
-        if (!name)
-                name = ".kconfig.d";
-        out = fopen("..config.tmp", "w");
-        if (!out)
-                return 1;
-        fprintf(out, "deps_config := \\\n");
-        for (file = file_list; file; file = file->next) {
-                if (file->next)
-                        fprintf(out, "\t%s \\\n", file->name);
-                else
-                        fprintf(out, "\t%s\n", file->name);
-        }
-        fprintf(out, "\n%s: \\\n"
-                     "\t$(deps_config)\n\n", conf_get_autoconfig_name());
-
-        env_write_dep(out, conf_get_autoconfig_name());
-
-        fprintf(out, "\n$(deps_config): ;\n");
-        fclose(out);
-        rename("..config.tmp", name);
-        return 0;
-}
-
-
 /* Allocate initial growable string */
 struct gstr str_new(void)
 {