From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: u-boot@lists.denx.de
Subject: [PATCH v1 06/11] console: Set file and devices at one go
Date: Thu, 11 Feb 2021 17:09:39 +0200 [thread overview]
Message-ID: <20210211150944.73252-6-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20210211150944.73252-1-andriy.shevchenko@linux.intel.com>
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>
---
common/console.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/common/console.c b/common/console.c
index 4595376dcc0b..672b4a1cc678 100644
--- a/common/console.c
+++ b/common/console.c
@@ -232,7 +232,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;
@@ -369,7 +369,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)
{
}
@@ -417,6 +417,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;
@@ -1071,17 +1077,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();
--
2.30.0
next prev parent reply other threads:[~2021-02-11 15:09 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-11 15:09 [PATCH v1 01/11] stdio: Get rid of dead code, i.e. stdio_deregister() Andy Shevchenko
2021-02-11 15:09 ` [PATCH v1 02/11] stdio: Split out nulldev_register() and move it under #if Andy Shevchenko
2021-02-16 21:56 ` Tom Rini
2021-02-11 15:09 ` [PATCH v1 03/11] stdio: Introduce a new helper stdio_file_to_flags() Andy Shevchenko
2021-02-16 21:56 ` Tom Rini
2021-02-11 15:09 ` [PATCH v1 04/11] console: Switch to use stdio_file_to_flags() Andy Shevchenko
2021-02-16 21:56 ` Tom Rini
2021-02-11 15:09 ` [PATCH v1 05/11] console: Set console device counter in console_devices_set() Andy Shevchenko
2021-02-16 21:57 ` Tom Rini
2021-02-11 15:09 ` Andy Shevchenko [this message]
2021-02-16 21:57 ` [PATCH v1 06/11] console: Set file and devices at one go Tom Rini
2021-02-11 15:09 ` [PATCH v1 07/11] IOMUX: Switch to use stdio_file_to_flags() Andy Shevchenko
2021-02-16 21:57 ` Tom Rini
2021-02-11 15:09 ` [PATCH v1 08/11] IOMUX: Split out iomux_match_device() helper Andy Shevchenko
2021-02-16 21:57 ` Tom Rini
2021-02-11 15:09 ` [PATCH v1 09/11] IOMUX: Split out for_each_console_dev() helper macro Andy Shevchenko
2021-02-16 21:57 ` Tom Rini
2021-02-11 15:09 ` [PATCH v1 10/11] IOMUX: Introduce iomux_replace_device() Andy Shevchenko
2021-02-16 21:57 ` Tom Rini
2021-02-11 15:09 ` [PATCH v1 11/11] usb: kbd: destroy device after console is stopped Andy Shevchenko
2021-02-16 21:57 ` Tom Rini
2021-02-16 21:56 ` [PATCH v1 01/11] stdio: Get rid of dead code, i.e. stdio_deregister() Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210211150944.73252-6-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox