| Message ID | 20200212100259.80438-1-andriy.shevchenko@linux.intel.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2] um: Don't use console_drivers directly | expand |
On Wed, Feb 12, 2020 at 12:02:59PM +0200, Andy Shevchenko wrote: > console_drivers is kind of (semi-)private variable to the console code. > Direct use of it make us stuck with it being exported here and there. > Reduce use of console_drivers by replacing it with for_each_console(). Any comments? > Cc: Thomas Meyer <thomas@m3y3r.de> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > v2: fix condition (we do NOT want to have a console), remove confusing comment > arch/um/kernel/kmsg_dump.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/arch/um/kernel/kmsg_dump.c b/arch/um/kernel/kmsg_dump.c > index 98bdf69e4c2e..e4abac6c9727 100644 > --- a/arch/um/kernel/kmsg_dump.c > +++ b/arch/um/kernel/kmsg_dump.c > @@ -9,20 +9,19 @@ static void kmsg_dumper_stdout(struct kmsg_dumper *dumper, > enum kmsg_dump_reason reason) > { > static char line[1024]; > - > + struct console *con; > size_t len = 0; > - bool con_available = false; > > /* only dump kmsg when no console is available */ > if (!console_trylock()) > return; > > - if (console_drivers != NULL) > - con_available = true; > + for_each_console(con) > + break; > > console_unlock(); > > - if (con_available == true) > + if (con) > return; > > printf("kmsg_dump:\n"); > -- > 2.25.0 >
On Thu, Mar 12, 2020 at 6:05 PM Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > > On Wed, Feb 12, 2020 at 12:02:59PM +0200, Andy Shevchenko wrote: > > console_drivers is kind of (semi-)private variable to the console code. > > Direct use of it make us stuck with it being exported here and there. > > Reduce use of console_drivers by replacing it with for_each_console(). > > Any comments? > > > Cc: Thomas Meyer <thomas@m3y3r.de> > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > > --- > > v2: fix condition (we do NOT want to have a console), remove confusing comment > > arch/um/kernel/kmsg_dump.c | 9 ++++----- > > 1 file changed, 4 insertions(+), 5 deletions(-) > > > > diff --git a/arch/um/kernel/kmsg_dump.c b/arch/um/kernel/kmsg_dump.c > > index 98bdf69e4c2e..e4abac6c9727 100644 > > --- a/arch/um/kernel/kmsg_dump.c > > +++ b/arch/um/kernel/kmsg_dump.c > > @@ -9,20 +9,19 @@ static void kmsg_dumper_stdout(struct kmsg_dumper *dumper, > > enum kmsg_dump_reason reason) > > { > > static char line[1024]; > > - > > + struct console *con; > > size_t len = 0; > > - bool con_available = false; > > > > /* only dump kmsg when no console is available */ > > if (!console_trylock()) > > return; > > > > - if (console_drivers != NULL) > > - con_available = true; > > + for_each_console(con) > > + break; > > > > console_unlock(); > > > > - if (con_available == true) > > + if (con) > > return; > > > > printf("kmsg_dump:\n"); > > -- Thanks for cleaning this up, applied.
diff --git a/arch/um/kernel/kmsg_dump.c b/arch/um/kernel/kmsg_dump.c index 98bdf69e4c2e..e4abac6c9727 100644 --- a/arch/um/kernel/kmsg_dump.c +++ b/arch/um/kernel/kmsg_dump.c @@ -9,20 +9,19 @@ static void kmsg_dumper_stdout(struct kmsg_dumper *dumper, enum kmsg_dump_reason reason) { static char line[1024]; - + struct console *con; size_t len = 0; - bool con_available = false; /* only dump kmsg when no console is available */ if (!console_trylock()) return; - if (console_drivers != NULL) - con_available = true; + for_each_console(con) + break; console_unlock(); - if (con_available == true) + if (con) return; printf("kmsg_dump:\n");
console_drivers is kind of (semi-)private variable to the console code. Direct use of it make us stuck with it being exported here and there. Reduce use of console_drivers by replacing it with for_each_console(). Cc: Thomas Meyer <thomas@m3y3r.de> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- v2: fix condition (we do NOT want to have a console), remove confusing comment arch/um/kernel/kmsg_dump.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)