[PATCH master 3/4] console: define barebox_set_loglevel

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxxxxxxx>
---
 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





[Index of Archives]     [Linux Embedded]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [XFree86]

  Powered by Linux