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>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
"Len Brown" <lenb@kernel.org>, James Morse <james.morse@arm.com>
Subject: [PATCH 08/32] acpi: Use pr_warn instead of pr_warning
Date: Fri, 20 Sep 2019 14:25:20 +0800 [thread overview]
Message-ID: <20190920062544.180997-9-wangkefeng.wang@huawei.com> (raw)
In-Reply-To: <20190920062544.180997-1-wangkefeng.wang@huawei.com>
As said in commit f2c2cbcc35d4 ("powerpc: Use pr_warn instead of
pr_warning"), removing pr_warning so all logging messages use a
consistent <prefix>_warn style. Let's do it.
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Len Brown <lenb@kernel.org>
Cc: James Morse <james.morse@arm.com>
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
drivers/acpi/apei/apei-base.c | 36 +++++++++++++++++------------------
drivers/acpi/apei/einj.c | 4 ++--
drivers/acpi/apei/erst-dbg.c | 5 ++---
drivers/acpi/apei/ghes.c | 25 ++++++++++++------------
drivers/acpi/apei/hest.c | 14 +++++++-------
drivers/acpi/battery.c | 2 +-
drivers/acpi/resource.c | 4 ++--
7 files changed, 44 insertions(+), 46 deletions(-)
diff --git a/drivers/acpi/apei/apei-base.c b/drivers/acpi/apei/apei-base.c
index 131c35ee9ed3..1bb2a94f49a3 100644
--- a/drivers/acpi/apei/apei-base.c
+++ b/drivers/acpi/apei/apei-base.c
@@ -170,7 +170,7 @@ int __apei_exec_run(struct apei_exec_context *ctx, u8 action,
if (ip == ctx->ip) {
if (entry->instruction >= ctx->instructions ||
!ctx->ins_table[entry->instruction].run) {
- pr_warning(FW_WARN APEI_PFX
+ pr_warn(FW_WARN APEI_PFX
"Invalid action table, unknown instruction type: %d\n",
entry->instruction);
return -EINVAL;
@@ -211,7 +211,7 @@ static int apei_exec_for_each_entry(struct apei_exec_context *ctx,
if (end)
*end = i;
if (ins >= ctx->instructions || !ins_table[ins].run) {
- pr_warning(FW_WARN APEI_PFX
+ pr_warn(FW_WARN APEI_PFX
"Invalid action table, unknown instruction type: %d\n",
ins);
return -EINVAL;
@@ -579,18 +579,18 @@ static int apei_check_gar(struct acpi_generic_address *reg, u64 *paddr,
space_id = reg->space_id;
*paddr = get_unaligned(®->address);
if (!*paddr) {
- pr_warning(FW_BUG APEI_PFX
- "Invalid physical address in GAR [0x%llx/%u/%u/%u/%u]\n",
- *paddr, bit_width, bit_offset, access_size_code,
- space_id);
+ pr_warn(FW_BUG APEI_PFX
+ "Invalid physical address in GAR [0x%llx/%u/%u/%u/%u]\n",
+ *paddr, bit_width, bit_offset, access_size_code,
+ space_id);
return -EINVAL;
}
if (access_size_code < 1 || access_size_code > 4) {
- pr_warning(FW_BUG APEI_PFX
- "Invalid access size code in GAR [0x%llx/%u/%u/%u/%u]\n",
- *paddr, bit_width, bit_offset, access_size_code,
- space_id);
+ pr_warn(FW_BUG APEI_PFX
+ "Invalid access size code in GAR [0x%llx/%u/%u/%u/%u]\n",
+ *paddr, bit_width, bit_offset, access_size_code,
+ space_id);
return -EINVAL;
}
*access_bit_width = 1UL << (access_size_code + 2);
@@ -604,19 +604,19 @@ static int apei_check_gar(struct acpi_generic_address *reg, u64 *paddr,
*access_bit_width = 64;
if ((bit_width + bit_offset) > *access_bit_width) {
- pr_warning(FW_BUG APEI_PFX
- "Invalid bit width + offset in GAR [0x%llx/%u/%u/%u/%u]\n",
- *paddr, bit_width, bit_offset, access_size_code,
- space_id);
+ pr_warn(FW_BUG APEI_PFX
+ "Invalid bit width + offset in GAR [0x%llx/%u/%u/%u/%u]\n",
+ *paddr, bit_width, bit_offset, access_size_code,
+ space_id);
return -EINVAL;
}
if (space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY &&
space_id != ACPI_ADR_SPACE_SYSTEM_IO) {
- pr_warning(FW_BUG APEI_PFX
- "Invalid address space type in GAR [0x%llx/%u/%u/%u/%u]\n",
- *paddr, bit_width, bit_offset, access_size_code,
- space_id);
+ pr_warn(FW_BUG APEI_PFX
+ "Invalid address space type in GAR [0x%llx/%u/%u/%u/%u]\n",
+ *paddr, bit_width, bit_offset, access_size_code,
+ space_id);
return -EINVAL;
}
diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c
index e430cf4caec2..086373f8ccb1 100644
--- a/drivers/acpi/apei/einj.c
+++ b/drivers/acpi/apei/einj.c
@@ -172,7 +172,7 @@ static int einj_get_available_error_type(u32 *type)
static int einj_timedout(u64 *t)
{
if ((s64)*t < SPIN_UNIT) {
- pr_warning(FW_WARN "Firmware does not respond in time\n");
+ pr_warn(FW_WARN "Firmware does not respond in time\n");
return 1;
}
*t -= SPIN_UNIT;
@@ -312,7 +312,7 @@ static int __einj_error_trigger(u64 trigger_paddr, u32 type,
}
rc = einj_check_trigger_header(trigger_tab);
if (rc) {
- pr_warning(FW_BUG "Invalid trigger error action table.\n");
+ pr_warn(FW_BUG "Invalid trigger error action table.\n");
goto out_rel_header;
}
diff --git a/drivers/acpi/apei/erst-dbg.c b/drivers/acpi/apei/erst-dbg.c
index d0f3a46716e9..c740f0faad39 100644
--- a/drivers/acpi/apei/erst-dbg.c
+++ b/drivers/acpi/apei/erst-dbg.c
@@ -118,9 +118,8 @@ static ssize_t erst_dbg_read(struct file *filp, char __user *ubuf,
if (rc < 0)
goto out;
if (len > ERST_DBG_RECORD_LEN_MAX) {
- pr_warning(ERST_DBG_PFX
- "Record (ID: 0x%llx) length is too long: %zd\n",
- id, len);
+ pr_warn(ERST_DBG_PFX
+ "Record (ID: 0x%llx) length is too long: %zd\n", id, len);
rc = -EIO;
goto out;
}
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index 777f6f7122b4..8906c80175e6 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -235,10 +235,10 @@ static struct ghes *ghes_new(struct acpi_hest_generic *generic)
goto err_unmap_read_ack_addr;
error_block_length = generic->error_block_length;
if (error_block_length > GHES_ESTATUS_MAX_SIZE) {
- pr_warning(FW_WARN GHES_PFX
- "Error status block length is too long: %u for "
- "generic hardware error source: %d.\n",
- error_block_length, generic->header.source_id);
+ pr_warn(FW_WARN GHES_PFX
+ "Error status block length is too long: %u for "
+ "generic hardware error source: %d.\n",
+ error_block_length, generic->header.source_id);
error_block_length = GHES_ESTATUS_MAX_SIZE;
}
ghes->estatus = kmalloc(error_block_length, GFP_KERNEL);
@@ -748,8 +748,8 @@ static void ghes_add_timer(struct ghes *ghes)
unsigned long expire;
if (!g->notify.poll_interval) {
- pr_warning(FW_WARN GHES_PFX "Poll interval is 0 for generic hardware error source: %d, disabled.\n",
- g->header.source_id);
+ pr_warn(FW_WARN GHES_PFX "Poll interval is 0 for generic hardware error source: %d, disabled.\n",
+ g->header.source_id);
return;
}
expire = jiffies + msecs_to_jiffies(g->notify.poll_interval);
@@ -1155,21 +1155,20 @@ static int ghes_probe(struct platform_device *ghes_dev)
}
break;
case ACPI_HEST_NOTIFY_LOCAL:
- pr_warning(GHES_PFX "Generic hardware error source: %d notified via local interrupt is not supported!\n",
- generic->header.source_id);
+ pr_warn(GHES_PFX "Generic hardware error source: %d notified via local interrupt is not supported!\n",
+ generic->header.source_id);
goto err;
default:
- pr_warning(FW_WARN GHES_PFX "Unknown notification type: %u for generic hardware error source: %d\n",
- generic->notify.type, generic->header.source_id);
+ pr_warn(FW_WARN GHES_PFX "Unknown notification type: %u for generic hardware error source: %d\n",
+ generic->notify.type, generic->header.source_id);
goto err;
}
rc = -EIO;
if (generic->error_block_length <
sizeof(struct acpi_hest_generic_status)) {
- pr_warning(FW_BUG GHES_PFX "Invalid error block length: %u for generic hardware error source: %d\n",
- generic->error_block_length,
- generic->header.source_id);
+ pr_warn(FW_BUG GHES_PFX "Invalid error block length: %u for generic hardware error source: %d\n",
+ generic->error_block_length, generic->header.source_id);
goto err;
}
ghes = ghes_new(generic);
diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c
index 267bdbf6a7bf..822402480f7d 100644
--- a/drivers/acpi/apei/hest.c
+++ b/drivers/acpi/apei/hest.c
@@ -92,15 +92,15 @@ int apei_hest_parse(apei_hest_func_t func, void *data)
for (i = 0; i < hest_tab->error_source_count; i++) {
len = hest_esrc_len(hest_hdr);
if (!len) {
- pr_warning(FW_WARN HEST_PFX
- "Unknown or unused hardware error source "
- "type: %d for hardware error source: %d.\n",
- hest_hdr->type, hest_hdr->source_id);
+ pr_warn(FW_WARN HEST_PFX
+ "Unknown or unused hardware error source "
+ "type: %d for hardware error source: %d.\n",
+ hest_hdr->type, hest_hdr->source_id);
return -EINVAL;
}
if ((void *)hest_hdr + len >
(void *)hest_tab + hest_tab->header.length) {
- pr_warning(FW_BUG HEST_PFX
+ pr_warn(FW_BUG HEST_PFX
"Table contents overflow for hardware error source: %d.\n",
hest_hdr->source_id);
return -EINVAL;
@@ -164,8 +164,8 @@ static int __init hest_parse_ghes(struct acpi_hest_header *hest_hdr, void *data)
ghes_dev = ghes_arr->ghes_devs[i];
hdr = *(struct acpi_hest_header **)ghes_dev->dev.platform_data;
if (hdr->source_id == hest_hdr->source_id) {
- pr_warning(FW_WARN HEST_PFX "Duplicated hardware error source ID: %d.\n",
- hdr->source_id);
+ pr_warn(FW_WARN HEST_PFX "Duplicated hardware error source ID: %d.\n",
+ hdr->source_id);
return -EIO;
}
}
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 558fedf8a7a1..8f0e0c8d8c3d 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -1176,7 +1176,7 @@ static const struct file_operations acpi_battery_alarm_fops = {
static int acpi_battery_add_fs(struct acpi_device *device)
{
- pr_warning(PREFIX "Deprecated procfs I/F for battery is loaded, please retry with CONFIG_ACPI_PROCFS_POWER cleared\n");
+ pr_warn(PREFIX "Deprecated procfs I/F for battery is loaded, please retry with CONFIG_ACPI_PROCFS_POWER cleared\n");
if (!acpi_device_dir(device)) {
acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),
acpi_battery_dir);
diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c
index 2a3e392751e0..3b4448972374 100644
--- a/drivers/acpi/resource.c
+++ b/drivers/acpi/resource.c
@@ -413,8 +413,8 @@ static void acpi_dev_get_irqresource(struct resource *res, u32 gsi,
u8 pol = p ? ACPI_ACTIVE_LOW : ACPI_ACTIVE_HIGH;
if (triggering != trig || polarity != pol) {
- pr_warning("ACPI: IRQ %d override to %s, %s\n", gsi,
- t ? "level" : "edge", p ? "low" : "high");
+ pr_warn("ACPI: IRQ %d override to %s, %s\n", gsi,
+ t ? "level" : "edge", p ? "low" : "high");
triggering = trig;
polarity = pol;
}
--
2.20.1
next prev parent reply other threads:[~2019-09-20 6:10 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 ` Kefeng Wang [this message]
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 ` [PATCH 29/32] tools lib api: Renaming pr_warning to pr_warn Kefeng Wang
2019-09-20 6:25 ` [PATCH 30/32] tools lib bpf: " 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-9-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=james.morse@arm.com \
--cc=joe@perches.com \
--cc=lenb@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=pmladek@suse.com \
--cc=rjw@rjwysocki.net \
--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).