diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2021-02-11 17:09:39 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-02-16 11:16:07 -0500 |
| commit | 09d8f07762747ca6cd530289ecdda21b1c92226b (patch) | |
| tree | ec88dafc9e2f510ff58b271e152ad707b19e015e /common/console.c | |
| parent | 20a7d351486f9d5afde55ffd9d8331e765add42d (diff) | |
| download | u-boot-09d8f07762747ca6cd530289ecdda21b1c92226b.tar.gz | |
console: Set file and devices at one go
Logical continuation of the change that brought console_devices_set() is
to unify console_setfile() with it and replace in the callers.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Diffstat (limited to 'common/console.c')
| -rw-r--r-- | common/console.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/common/console.c b/common/console.c index 9064a6c230..7b6861f214 100644 --- a/common/console.c +++ b/common/console.c @@ -233,7 +233,7 @@ static struct stdio_dev *tstcdev; struct stdio_dev **console_devices[MAX_FILES]; int cd_count[MAX_FILES]; -static void __maybe_unused console_devices_set(int file, struct stdio_dev *dev) +static void console_devices_set(int file, struct stdio_dev *dev) { console_devices[file][0] = dev; cd_count[file] = 1; @@ -370,7 +370,7 @@ static inline void console_doenv(int file, struct stdio_dev *dev) #endif #else -static void __maybe_unused console_devices_set(int file, struct stdio_dev *dev) +static void console_devices_set(int file, struct stdio_dev *dev) { } @@ -418,6 +418,12 @@ static inline void console_doenv(int file, struct stdio_dev *dev) #endif #endif /* CONIFIG_IS_ENABLED(CONSOLE_MUX) */ +static void __maybe_unused console_setfile_and_devices(int file, struct stdio_dev *dev) +{ + console_setfile(file, dev); + console_devices_set(file, dev); +} + int console_start(int file, struct stdio_dev *sdev) { int error; @@ -1072,17 +1078,13 @@ int console_init_r(void) /* Initializes output console first */ if (outputdev != NULL) { - console_setfile(stdout, outputdev); - console_setfile(stderr, outputdev); - console_devices_set(stdout, outputdev); - console_devices_set(stderr, outputdev); + console_setfile_and_devices(stdout, outputdev); + console_setfile_and_devices(stderr, outputdev); } /* Initializes input console */ - if (inputdev != NULL) { - console_setfile(stdin, inputdev); - console_devices_set(stdin, inputdev); - } + if (inputdev != NULL) + console_setfile_and_devices(stdin, inputdev); if (!IS_ENABLED(CONFIG_SYS_CONSOLE_INFO_QUIET)) stdio_print_current_devices(); |