Commit 28856ab2 authored by Breno Leitao's avatar Breno Leitao Committed by Jakub Kicinski
Browse files

netconsole: move init/cleanup functions lower 



Move alloc_param_target() and its counterpart (free_param_target())
to the bottom of the file. These functions are called mostly at
initialization/cleanup of the module, and they should be just above the
callers, at the bottom of the file.

From a practical perspective, having alloc_param_target() at the bottom
of the file will avoid forward declaration later (in the following
patch).

Nothing changed other than the functions location.

Suggested-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarBreno Leitao <leitao@debian.org>
Link: https://lore.kernel.org/r/20231012111401.333798-2-leitao@debian.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 220dd227

drivers/net/netconsole.c

+52 −52
Original line number Diff line number Diff line
@@ -192,58 +192,6 @@ static struct netconsole_target *alloc_and_init(void) 
	return nt;

}



/* Allocate new target (from boot/module param) and setup netpoll for it */

static struct netconsole_target *alloc_param_target(char *target_config)

{

	struct netconsole_target *nt;

	int err;



	nt = alloc_and_init();

	if (!nt) {

		err = -ENOMEM;

		goto fail;

	}



	if (*target_config == '+') {

		nt->extended = true;

		target_config++;

	}



	if (*target_config == 'r') {

		if (!nt->extended) {

			pr_err("Netconsole configuration error. Release feature requires extended log message");

			err = -EINVAL;

			goto fail;

		}

		nt->release = true;

		target_config++;

	}



	/* Parse parameters and setup netpoll */

	err = netpoll_parse_options(&nt->np, target_config);

	if (err)

		goto fail;



	err = netpoll_setup(&nt->np);

	if (err)

		goto fail;



	nt->enabled = true;



	return nt;



fail:

	kfree(nt);

	return ERR_PTR(err);

}



/* Cleanup netpoll for given target (from boot/module param) and free it */

static void free_param_target(struct netconsole_target *nt)

{

	netpoll_cleanup(&nt->np);

	kfree(nt);

}



#ifdef	CONFIG_NETCONSOLE_DYNAMIC



/*
@@ -938,6 +886,58 @@ static void write_msg(struct console *con, const char *msg, unsigned int len) 
	spin_unlock_irqrestore(&target_list_lock, flags);

}



/* Allocate new target (from boot/module param) and setup netpoll for it */

static struct netconsole_target *alloc_param_target(char *target_config)

{

	struct netconsole_target *nt;

	int err;



	nt = alloc_and_init();

	if (!nt) {

		err = -ENOMEM;

		goto fail;

	}



	if (*target_config == '+') {

		nt->extended = true;

		target_config++;

	}



	if (*target_config == 'r') {

		if (!nt->extended) {

			pr_err("Netconsole configuration error. Release feature requires extended log message");

			err = -EINVAL;

			goto fail;

		}

		nt->release = true;

		target_config++;

	}



	/* Parse parameters and setup netpoll */

	err = netpoll_parse_options(&nt->np, target_config);

	if (err)

		goto fail;



	err = netpoll_setup(&nt->np);

	if (err)

		goto fail;



	nt->enabled = true;



	return nt;



fail:

	kfree(nt);

	return ERR_PTR(err);

}



/* Cleanup netpoll for given target (from boot/module param) and free it */

static void free_param_target(struct netconsole_target *nt)

{

	netpoll_cleanup(&nt->np);

	kfree(nt);

}



static struct console netconsole_ext = {

	.name	= "netcon_ext",

	.flags	= CON_ENABLED | CON_EXTENDED,