From: Kefeng Wang <wangkefeng.wang@huawei.com>
To: Joe Perches <joe@perches.com>,
Andrew Morton <akpm@linux-foundation.org>,
Ingo Molnar <mingo@redhat.com>,
"David S. Miller" <davem@davemloft.net>,
Arnaldo Carvalho de Melo <acme@redhat.com>,
Andy Whitcroft <apw@canonical.com>,
Peter Zijlstra <peterz@infradead.org>,
"Alexei Starovoitov" <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
Petr Mladek <pmladek@suse.com>, Arnd Bergmann <arnd@arndb.de>,
<linux-kernel@vger.kernel.org>
Cc: <wangkefeng.wang@huawei.com>
Subject: [PATCH 29/32] tools lib api: Renaming pr_warning to pr_warn
Date: Fri, 20 Sep 2019 14:25:41 +0800 [thread overview]
Message-ID: <20190920062544.180997-30-wangkefeng.wang@huawei.com> (raw)
In-Reply-To: <20190920062544.180997-1-wangkefeng.wang@huawei.com>
For kernel logging macro, pr_warning is completely removed and
replaced by pr_warn, using pr_warn in tools lib api for symmetry
to kernel logging macro, then we could drop pr_warning in the
whole linux code.
Changing __pr_warning to __pr_warn to be consistent.
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
tools/lib/api/debug-internal.h | 4 ++--
tools/lib/api/debug.c | 4 ++--
tools/lib/api/fs/fs.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/tools/lib/api/debug-internal.h b/tools/lib/api/debug-internal.h
index 80c783497d25..5a5820c11db8 100644
--- a/tools/lib/api/debug-internal.h
+++ b/tools/lib/api/debug-internal.h
@@ -10,11 +10,11 @@ do { \
(func)("libapi: " fmt, ##__VA_ARGS__); \
} while (0)
-extern libapi_print_fn_t __pr_warning;
+extern libapi_print_fn_t __pr_warn;
extern libapi_print_fn_t __pr_info;
extern libapi_print_fn_t __pr_debug;
-#define pr_warning(fmt, ...) __pr(__pr_warning, fmt, ##__VA_ARGS__)
+#define pr_warn(fmt, ...) __pr(__pr_warn, fmt, ##__VA_ARGS__)
#define pr_info(fmt, ...) __pr(__pr_info, fmt, ##__VA_ARGS__)
#define pr_debug(fmt, ...) __pr(__pr_debug, fmt, ##__VA_ARGS__)
diff --git a/tools/lib/api/debug.c b/tools/lib/api/debug.c
index 69b1ba3d1ee3..7708f0558e8c 100644
--- a/tools/lib/api/debug.c
+++ b/tools/lib/api/debug.c
@@ -15,7 +15,7 @@ static int __base_pr(const char *format, ...)
return err;
}
-libapi_print_fn_t __pr_warning = __base_pr;
+libapi_print_fn_t __pr_warn = __base_pr;
libapi_print_fn_t __pr_info = __base_pr;
libapi_print_fn_t __pr_debug;
@@ -23,7 +23,7 @@ void libapi_set_print(libapi_print_fn_t warn,
libapi_print_fn_t info,
libapi_print_fn_t debug)
{
- __pr_warning = warn;
+ __pr_warn = warn;
__pr_info = info;
__pr_debug = debug;
}
diff --git a/tools/lib/api/fs/fs.c b/tools/lib/api/fs/fs.c
index 7aba8243a0e7..11b3885e833e 100644
--- a/tools/lib/api/fs/fs.c
+++ b/tools/lib/api/fs/fs.c
@@ -381,8 +381,8 @@ int filename__read_str(const char *filename, char **buf, size_t *sizep)
n = read(fd, bf + size, alloc_size - size);
if (n < 0) {
if (size) {
- pr_warning("read failed %d: %s\n", errno,
- strerror_r(errno, sbuf, sizeof(sbuf)));
+ pr_warn("read failed %d: %s\n", errno,
+ strerror_r(errno, sbuf, sizeof(sbuf)));
err = 0;
} else
err = -errno;
--
2.20.1
next prev parent reply other threads:[~2019-09-20 6:09 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-20 6:25 [PATCH 00/32] Kill pr_warning in the whole linux code Kefeng Wang
2019-09-20 6:25 ` [PATCH 01/32] alpha: Use pr_warn instead of pr_warning Kefeng Wang
2019-09-20 6:25 ` [PATCH 02/32] arm64: " Kefeng Wang
2019-09-20 15:57 ` Will Deacon
2019-09-20 6:25 ` [PATCH 03/32] ia64: " Kefeng Wang
2019-09-20 6:25 ` [PATCH 04/32] riscv: " Kefeng Wang
2019-09-25 21:05 ` Palmer Dabbelt
2019-09-20 6:25 ` [PATCH 05/32] sh: " Kefeng Wang
2019-09-20 6:25 ` [PATCH 06/32] sparc: " Kefeng Wang
2019-09-20 6:25 ` [PATCH 07/32] x86: " Kefeng Wang
2019-09-20 9:28 ` Robert Richter
2019-09-20 11:57 ` Kefeng Wang
2019-09-20 15:28 ` Joe Perches
2019-09-26 1:30 ` Kefeng Wang
2019-09-20 6:25 ` [PATCH 08/32] acpi: " Kefeng Wang
2019-09-20 6:25 ` [PATCH 09/32] drbd: " Kefeng Wang
2019-09-20 6:25 ` [PATCH 10/32] gdrom: " Kefeng Wang
2019-09-20 6:25 ` [PATCH 11/32] clocksource: samsung_pwm_timer: " Kefeng Wang
2019-09-20 8:25 ` Daniel Lezcano
2019-09-20 6:25 ` [PATCH 12/32] crypto: n2: " Kefeng Wang
2019-09-20 6:25 ` [PATCH 13/32] ide: " Kefeng Wang
2019-09-20 6:25 ` [PATCH 14/32] idsn: " Kefeng Wang
2019-09-20 6:25 ` [PATCH 15/32] macintosh: " Kefeng Wang
2019-09-20 6:25 ` [PATCH 16/32] of: " Kefeng Wang
2019-09-20 6:25 ` [PATCH 17/32] oprofile: " Kefeng Wang
2019-09-20 9:18 ` Robert Richter
2019-09-20 6:25 ` [PATCH 18/32] platform/x86: " Kefeng Wang
2019-09-20 6:26 ` Andy Shevchenko
2019-09-20 6:31 ` Kefeng Wang
2019-09-20 11:12 ` [PATCH v2 1/3] platform/x86: eeepc-laptop: " Kefeng Wang
2019-09-20 11:12 ` [PATCH v2 2/3] platform/x86: asus-laptop: " Kefeng Wang
2019-09-20 11:12 ` [PATCH v2 3/3] platform/x86: intel_oaktrail: " Kefeng Wang
2019-09-25 15:04 ` Andy Shevchenko
2019-09-26 1:28 ` Kefeng Wang
2019-09-26 5:48 ` Andy Shevchenko
2019-09-26 6:09 ` Kefeng Wang
2019-09-26 7:32 ` Andy Shevchenko
2019-09-26 7:48 ` Kefeng Wang
2019-09-20 6:25 ` [PATCH 19/32] scsi: " Kefeng Wang
2019-09-20 6:25 ` [PATCH 20/32] sh/intc: " Kefeng Wang
2019-09-20 6:25 ` [PATCH 21/32] staging: " Kefeng Wang
2019-09-20 6:25 ` [PATCH 22/32] fs: afs: " Kefeng Wang
2019-09-20 6:25 ` [PATCH 23/32] vgacon: " Kefeng Wang
2019-09-20 6:25 ` [PATCH 24/32] dma-debug: " Kefeng Wang
2019-09-25 17:13 ` Christoph Hellwig
2019-09-26 1:44 ` Kefeng Wang
2019-09-20 6:25 ` [PATCH 25/32] trace: " Kefeng Wang
2019-09-20 13:26 ` Steven Rostedt
2019-09-20 6:25 ` [PATCH 26/32] lib: cpu_rmap: " Kefeng Wang
2019-09-20 6:25 ` [PATCH 27/32] ASoC: samsung: " Kefeng Wang
2019-09-20 6:25 ` [PATCH 28/32] printk: Drop pr_warning Kefeng Wang
2019-09-20 6:25 ` Kefeng Wang [this message]
2019-09-20 6:25 ` [PATCH 30/32] tools lib bpf: Renaming pr_warning to pr_warn Kefeng Wang
2019-09-22 21:07 ` Andrii Nakryiko
2019-09-23 8:20 ` Daniel Borkmann
2019-09-23 11:03 ` Petr Mladek
2019-09-23 13:35 ` Daniel Borkmann
2019-09-26 2:01 ` Kefeng Wang
2019-09-20 6:25 ` [PATCH 31/32] tools perf: " Kefeng Wang
2019-09-20 6:25 ` [PATCH 32/32] checkpatch: Drop pr_warning check Kefeng Wang
2019-09-20 9:29 ` [PATCH 00/32] Kill pr_warning in the whole linux code Sergey Senozhatsky
2019-10-02 8:55 ` Petr Mladek
2019-10-08 6:39 ` Kefeng Wang
2019-10-17 13:05 ` Petr Mladek
2019-10-17 13:29 ` Kefeng Wang
2019-10-17 13:52 ` Petr Mladek
2019-10-17 16:38 ` Joe Perches
2019-10-18 1:11 ` Kefeng Wang
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=20190920062544.180997-30-wangkefeng.wang@huawei.com \
--to=wangkefeng.wang@huawei.com \
--cc=acme@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=apw@canonical.com \
--cc=arnd@arndb.de \
--cc=ast@kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=gregkh@linuxfoundation.org \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=pmladek@suse.com \
--cc=sergey.senozhatsky@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).