bootconfig: Rename xbc_destroy_all() to xbc_exit()

Avoid using this noisy name and use more calm one.
This is just a name change. No functional change.

Link: https://lkml.kernel.org/r/163187295918.2366983.5231840238429996027.stgit@devnote2
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

diff --git a/include/linux/bootconfig.h b/include/linux/bootconfig.h
index f955bb7eabbb34729de6301ad0c90b0d4e875927..7eb7a7f8ade7c9cd6446ff86d2f2f5d7636cc906 100644 (file)
--- a/include/linux/bootconfig.h
+++ b/include/linux/bootconfig.h
@@ -277,7 +277,7 @@ int __init xbc_init(const char *buf, size_t size, const char **emsg, int *epos);
 int __init xbc_get_info(int *node_size, size_t *data_size);
 
 /* XBC cleanup data structures */
-void __init xbc_destroy_all(void);
+void __init xbc_exit(void);
 
 /* Debug dump functions */
 void __init xbc_debug_dump(void);

diff --git a/init/main.c b/init/main.c
index afaed805de195b65b5ecb229b8270b4216557c27..f1428234e1e433c97fcd9812e3a39ce903828aae 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -462,7 +462,7 @@ static void __init setup_boot_config(void)
 
 static void __init exit_boot_config(void)
 {
-       xbc_destroy_all();
+       xbc_exit();
 }
 
 #else  /* !CONFIG_BOOT_CONFIG */

diff --git a/lib/bootconfig.c b/lib/bootconfig.c
index b088fe5c0001cd24ca9f162283cb189f45b5a331..a3ce5a0c3ca43e73da128900d093e5792e2a2e73 100644 (file)
--- a/lib/bootconfig.c
+++ b/lib/bootconfig.c
@@ -802,13 +802,13 @@ static int __init xbc_verify_tree(void)
 }
 
 /**
- * xbc_destroy_all() - Clean up all parsed bootconfig
+ * xbc_exit() - Clean up all parsed bootconfig
  *
  * This clears all data structures of parsed bootconfig on memory.
  * If you need to reuse xbc_init() with new boot config, you can
  * use this.
  */
-void __init xbc_destroy_all(void)
+void __init xbc_exit(void)
 {
        memblock_free_ptr(xbc_data, xbc_data_size);
        xbc_data = NULL;
@@ -869,7 +869,7 @@ int __init xbc_init(const char *data, size_t size, const char **emsg, int *epos)
        if (!xbc_nodes) {
                if (emsg)
                        *emsg = "Failed to allocate bootconfig nodes";
-               xbc_destroy_all();
+               xbc_exit();
                return -ENOMEM;
        }
        memset(xbc_nodes, 0, sizeof(struct xbc_node) * XBC_NODE_MAX);
@@ -925,7 +925,7 @@ int __init xbc_init(const char *data, size_t size, const char **emsg, int *epos)
                        *epos = xbc_err_pos;
                if (emsg)
                        *emsg = xbc_err_msg;
-               xbc_destroy_all();
+               xbc_exit();
        } else
                ret = xbc_node_num;
 

diff --git a/tools/bootconfig/main.c b/tools/bootconfig/main.c
index 4f2a8d88474557f005b2a56409191c5431fe9b56..4252c23bd35daa97e48f2a8d439304218196474c 100644 (file)
--- a/tools/bootconfig/main.c
+++ b/tools/bootconfig/main.c
@@ -397,7 +397,7 @@ static int apply_xbc(const char *path, const char *xbc_path)
        printf("\tChecksum: %d\n", (unsigned int)csum);
 
        /* TODO: Check the options by schema */
-       xbc_destroy_all();
+       xbc_exit();
        free(buf);
 
        /* Remove old boot config if exists */