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: Jakub Kicinski <[email protected]>
Signed-off-by: Breno Leitao <[email protected]>
---
drivers/net/netconsole.c | 104 +++++++++++++++++++--------------------
1 file changed, 52 insertions(+), 52 deletions(-)
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index 3111e1648592..d609fb59cf99 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -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,
--
2.34.1
On Thu, Oct 12, 2023 at 04:13:58AM -0700, Breno Leitao wrote:
> 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: Jakub Kicinski <[email protected]>
> Signed-off-by: Breno Leitao <[email protected]>
Reviewed-by: Joel Becker <[email protected]>
> ---
> drivers/net/netconsole.c | 104 +++++++++++++++++++--------------------
> 1 file changed, 52 insertions(+), 52 deletions(-)
>
> diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
> index 3111e1648592..d609fb59cf99 100644
> --- a/drivers/net/netconsole.c
> +++ b/drivers/net/netconsole.c
> @@ -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,
> --
> 2.34.1
>
--
"There is shadow under this red rock.
(Come in under the shadow of this red rock)
And I will show you something different from either
Your shadow at morning striding behind you
Or your shadow at evening rising to meet you.
I will show you fear in a handful of dust."
http://www.jlbec.org/
[email protected]