[PATCH 1/3] printk: make preferred_console local static bool

[Andy Shevchenko]

On Mon, Jan 25, 2016 at 1:45 PM, Aleksey Makarov
<aleksey.makarov at linaro.org> wrote:
> The variable preferred_console is used only inside register_console()
> and it's semantics is boolean.  Make it clear.

However the patch looks okay it brings imbalance to understanding how
exactly the preferred console is chosen.
Even in case of restricted usage I would leave things as is for now.

>
> Signed-off-by: Aleksey Makarov <aleksey.makarov at linaro.org>
> ---
>  kernel/printk/printk.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
> index 2ce8826..37e531f 100644
> --- a/kernel/printk/printk.c
> +++ b/kernel/printk/printk.c
> @@ -143,7 +143,6 @@ static struct console *exclusive_console;
>  static struct console_cmdline console_cmdline[MAX_CMDLINECONSOLES];
>
>  static int selected_console = -1;
> -static int preferred_console = -1;
>  int console_set_on_cmdline;
>  EXPORT_SYMBOL(console_set_on_cmdline);
>
> @@ -2456,6 +2455,7 @@ void register_console(struct console *newcon)
>         unsigned long flags;
>         struct console *bcon = NULL;
>         struct console_cmdline *c;
> +       static bool preferred_console;
>
>         if (console_drivers)
>                 for_each_console(bcon)
> @@ -2482,15 +2482,15 @@ void register_console(struct console *newcon)
>         if (console_drivers && console_drivers->flags & CON_BOOT)
>                 bcon = console_drivers;
>
> -       if (preferred_console < 0 || bcon || !console_drivers)
> -               preferred_console = selected_console;
> +       if (!preferred_console || bcon || !console_drivers)
> +               preferred_console = selected_console >= 0;
>
>         /*
>          *      See if we want to use this console driver. If we
>          *      didn't select a console we take the first one
>          *      that registers here.
>          */
> -       if (preferred_console < 0) {
> +       if (!preferred_console) {
>                 if (newcon->index < 0)
>                         newcon->index = 0;
>                 if (newcon->setup == NULL ||
> @@ -2498,7 +2498,7 @@ void register_console(struct console *newcon)
>                         newcon->flags |= CON_ENABLED;
>                         if (newcon->device) {
>                                 newcon->flags |= CON_CONSDEV;
> -                               preferred_console = 0;
> +                               preferred_console = true;
>                         }
>                 }
>         }
> @@ -2533,7 +2533,7 @@ void register_console(struct console *newcon)
>                 newcon->flags |= CON_ENABLED;
>                 if (i == selected_console) {
>                         newcon->flags |= CON_CONSDEV;
> -                       preferred_console = selected_console;
> +                       preferred_console = true;
>                 }
>                 break;
>         }
> --
> 2.7.0
>



-- 
With Best Regards,
Andy Shevchenko