Commit 115d4d08 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Steven Rostedt (VMware)
Browse files

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: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent f30f00cc

include/linux/bootconfig.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

init/main.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

lib/bootconfig.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

tools/bootconfig/main.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */