From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH master 3/4] console: define barebox_set_loglevel
Date: Mon, 20 Nov 2023 08:21:21 +0100 [thread overview]
Message-ID: <20231120072122.2006805-3-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20231120072122.2006805-1-a.fatoum@pengutronix.de>
Selftests may want to change barebox_loglevel temporarily to avoid expected
warning or error messages cluttering the log. barebox_loglevel is only
defined for !CONFIG_CONSOLE_NONE though, so add a stub for the
console-less case.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
include/console.h | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/include/console.h b/include/console.h
index b400b6bf49ec..477ca34e7aa9 100644
--- a/include/console.h
+++ b/include/console.h
@@ -96,8 +96,6 @@ struct console_device *of_console_get_by_alias(const char *alias);
#define CFG_PBSIZE (CONFIG_CBSIZE+sizeof(CONFIG_PROMPT)+16)
-extern int barebox_loglevel;
-
int console_open(struct console_device *cdev);
int console_close(struct console_device *cdev);
int console_set_active(struct console_device *cdev, unsigned active);
@@ -201,6 +199,14 @@ extern struct list_head console_list;
#define for_each_console(console) list_for_each_entry(console, &console_list, list)
struct console_device *console_get_first_active(void);
+
+extern int barebox_loglevel;
+static inline int barebox_set_loglevel(int loglevel)
+{
+ int old_loglevel = barebox_loglevel;
+ barebox_loglevel = loglevel;
+ return old_loglevel;
+}
#else
#define for_each_console(console) while (((void)console, 0))
@@ -208,6 +214,11 @@ static inline struct console_device *console_get_first_active(void)
{
return NULL;
}
+
+static inline int barebox_set_loglevel(int loglevel)
+{
+ return loglevel;
+}
#endif
#ifdef CONFIG_CONSOLE_FULL
--
2.39.2
next prev parent reply other threads:[~2023-11-20 7:23 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-20 7:21 [PATCH master 1/4] console: define stub for console_get_first_active Ahmad Fatoum
2023-11-20 7:21 ` [PATCH master 2/4] console: add for_each_console stub Ahmad Fatoum
2023-11-20 7:21 ` Ahmad Fatoum [this message]
2023-11-20 7:21 ` [PATCH master 4/4] test: self: jwt: use barebox_set_loglevel Ahmad Fatoum
2023-11-21 6:57 ` [PATCH master 1/4] console: define stub for console_get_first_active Sascha Hauer
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=20231120072122.2006805-3-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.org \
/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