diff options
author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2023-02-02 14:34:15 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2023-02-03 08:59:46 +0100 |
commit | b885cfc731c710eaf1efd55211b4b62fa5ade166 (patch) | |
tree | 4a9f1849658990a57383cc8bbdc419a2ca3fbbde | |
parent | b58bffa85df81a32a6bdf3d732dc8987834ba83f (diff) | |
download | barebox-b885cfc731c710eaf1efd55211b4b62fa5ade166.tar.gz barebox-b885cfc731c710eaf1efd55211b4b62fa5ade166.tar.xz |
include: printk: retire printk_once for pr_debug_once
printk is just printf and KERN_DEBUG is just "", so printk_once(KERN_DEBUG
doesn't do what's promised. Replace instead with pr_debug_once, which
does what one would expect.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Link: https://lore.barebox.org/20230202133415.319020-3-a.fatoum@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r-- | include/printk.h | 10 | ||||
-rw-r--r-- | lib/list_sort.c | 5 | ||||
-rw-r--r-- | scripts/bareboxenv.c | 2 |
3 files changed, 3 insertions, 14 deletions
diff --git a/include/printk.h b/include/printk.h index 90c45afd9f..6f8635fae2 100644 --- a/include/printk.h +++ b/include/printk.h @@ -31,16 +31,6 @@ void __attribute__((noreturn)) panic(const char *fmt, ...); #define printk printf -#define printk_once(fmt, ...) \ -({ \ - static bool __print_once ; \ - \ - if (!__print_once) { \ - __print_once = true; \ - printk(fmt, ##__VA_ARGS__); \ - } \ -}) - enum { DUMP_PREFIX_NONE, DUMP_PREFIX_ADDRESS, diff --git a/lib/list_sort.c b/lib/list_sort.c index 77ddadb3d6..eea87f834c 100644 --- a/lib/list_sort.c +++ b/lib/list_sort.c @@ -4,6 +4,7 @@ #include <linux/kernel.h> #define EXPORT_SYMBOL(x) #else +#define pr_fmt(fmt) "list_sort: " fmt #include <common.h> #include <malloc.h> #endif @@ -129,9 +130,7 @@ void list_sort(void *priv, struct list_head *head, } if (lev > max_lev) { if (unlikely(lev >= ARRAY_SIZE(part)-1)) { - printk_once(KERN_DEBUG "list passed to" - " list_sort() too long for" - " efficiency\n"); + pr_debug_once("list passed to too long for efficient sorting\n"); lev--; } max_lev = lev; diff --git a/scripts/bareboxenv.c b/scripts/bareboxenv.c index f1706a5e17..e954447015 100644 --- a/scripts/bareboxenv.c +++ b/scripts/bareboxenv.c @@ -20,7 +20,7 @@ #include "compiler.h" #define debug(...) -#define printk_once(...) +#define pr_debug_once(...) /* Find out if the last character of a string matches the one given. * Don't underrun the buffer if the string length is 0. |