From: Kefeng Wang <wangkefeng.wang@huawei.com>
To: Petr Mladek <pmladek@suse.com>, <linux-kernel@vger.kernel.org>
Cc: Kefeng Wang <wangkefeng.wang@huawei.com>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
<linuxppc-dev@lists.ozlabs.org>,
"Sergey Senozhatsky" <sergey.senozhatsky@gmail.com>
Subject: [PATCH v2 15/33] macintosh: Use pr_warn instead of pr_warning
Date: Fri, 18 Oct 2019 11:18:32 +0800 [thread overview]
Message-ID: <20191018031850.48498-15-wangkefeng.wang@huawei.com> (raw)
In-Reply-To: <20191018031850.48498-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: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: linuxppc-dev@lists.ozlabs.org
Reviewed-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
drivers/macintosh/windfarm_fcu_controls.c | 4 +---
drivers/macintosh/windfarm_lm87_sensor.c | 4 ++--
drivers/macintosh/windfarm_pm72.c | 22 +++++++++++-----------
drivers/macintosh/windfarm_rm31.c | 6 +++---
4 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/drivers/macintosh/windfarm_fcu_controls.c b/drivers/macintosh/windfarm_fcu_controls.c
index 3c971297b6dc..67daeec94b44 100644
--- a/drivers/macintosh/windfarm_fcu_controls.c
+++ b/drivers/macintosh/windfarm_fcu_controls.c
@@ -468,9 +468,7 @@ static void wf_fcu_lookup_fans(struct wf_fcu_priv *pv)
else
id = ((*reg) - 0x30) / 2;
if (id > 7) {
- pr_warning("wf_fcu: Can't parse "
- "fan ID in device-tree for %pOF\n",
- np);
+ pr_warn("wf_fcu: Can't parse fan ID in device-tree for %pOF\n", np);
break;
}
wf_fcu_add_fan(pv, name, type, id);
diff --git a/drivers/macintosh/windfarm_lm87_sensor.c b/drivers/macintosh/windfarm_lm87_sensor.c
index e44525b19071..b03a33b803b7 100644
--- a/drivers/macintosh/windfarm_lm87_sensor.c
+++ b/drivers/macintosh/windfarm_lm87_sensor.c
@@ -124,8 +124,8 @@ static int wf_lm87_probe(struct i2c_client *client,
}
}
if (!name) {
- pr_warning("wf_lm87: Unsupported sensor %pOF\n",
- client->dev.of_node);
+ pr_warn("wf_lm87: Unsupported sensor %pOF\n",
+ client->dev.of_node);
return -ENODEV;
}
diff --git a/drivers/macintosh/windfarm_pm72.c b/drivers/macintosh/windfarm_pm72.c
index c5da0fc24884..e81746b87cff 100644
--- a/drivers/macintosh/windfarm_pm72.c
+++ b/drivers/macintosh/windfarm_pm72.c
@@ -285,8 +285,8 @@ static void cpu_fans_tick_split(void)
/* Apply result directly to exhaust fan */
err = wf_control_set(cpu_rear_fans[cpu], sp->target);
if (err) {
- pr_warning("wf_pm72: Fan %s reports error %d\n",
- cpu_rear_fans[cpu]->name, err);
+ pr_warn("wf_pm72: Fan %s reports error %d\n",
+ cpu_rear_fans[cpu]->name, err);
failure_state |= FAILURE_FAN;
break;
}
@@ -296,8 +296,8 @@ static void cpu_fans_tick_split(void)
DBG_LOTS(" CPU%d: intake = %d RPM\n", cpu, intake);
err = wf_control_set(cpu_front_fans[cpu], intake);
if (err) {
- pr_warning("wf_pm72: Fan %s reports error %d\n",
- cpu_front_fans[cpu]->name, err);
+ pr_warn("wf_pm72: Fan %s reports error %d\n",
+ cpu_front_fans[cpu]->name, err);
failure_state |= FAILURE_FAN;
break;
}
@@ -367,22 +367,22 @@ static void cpu_fans_tick_combined(void)
for (cpu = 0; cpu < nr_chips; cpu++) {
err = wf_control_set(cpu_rear_fans[cpu], sp->target);
if (err) {
- pr_warning("wf_pm72: Fan %s reports error %d\n",
- cpu_rear_fans[cpu]->name, err);
+ pr_warn("wf_pm72: Fan %s reports error %d\n",
+ cpu_rear_fans[cpu]->name, err);
failure_state |= FAILURE_FAN;
}
err = wf_control_set(cpu_front_fans[cpu], intake);
if (err) {
- pr_warning("wf_pm72: Fan %s reports error %d\n",
- cpu_front_fans[cpu]->name, err);
+ pr_warn("wf_pm72: Fan %s reports error %d\n",
+ cpu_front_fans[cpu]->name, err);
failure_state |= FAILURE_FAN;
}
err = 0;
if (cpu_pumps[cpu])
err = wf_control_set(cpu_pumps[cpu], pump);
if (err) {
- pr_warning("wf_pm72: Pump %s reports error %d\n",
- cpu_pumps[cpu]->name, err);
+ pr_warn("wf_pm72: Pump %s reports error %d\n",
+ cpu_pumps[cpu]->name, err);
failure_state |= FAILURE_FAN;
}
}
@@ -561,7 +561,7 @@ static void drives_fan_tick(void)
err = wf_sensor_get(drives_temp, &temp);
if (err) {
- pr_warning("wf_pm72: drive bay temp sensor error %d\n", err);
+ pr_warn("wf_pm72: drive bay temp sensor error %d\n", err);
failure_state |= FAILURE_SENSOR;
wf_control_set_max(drives_fan);
return;
diff --git a/drivers/macintosh/windfarm_rm31.c b/drivers/macintosh/windfarm_rm31.c
index 8456eb67184b..7acd1684c451 100644
--- a/drivers/macintosh/windfarm_rm31.c
+++ b/drivers/macintosh/windfarm_rm31.c
@@ -281,8 +281,8 @@ static void cpu_fans_tick(void)
for (i = 0; i < 3; i++) {
err = wf_control_set(cpu_fans[cpu][i], speed);
if (err) {
- pr_warning("wf_rm31: Fan %s reports error %d\n",
- cpu_fans[cpu][i]->name, err);
+ pr_warn("wf_rm31: Fan %s reports error %d\n",
+ cpu_fans[cpu][i]->name, err);
failure_state |= FAILURE_FAN;
}
}
@@ -465,7 +465,7 @@ static void slots_fan_tick(void)
err = wf_sensor_get(slots_temp, &temp);
if (err) {
- pr_warning("wf_rm31: slots temp sensor error %d\n", err);
+ pr_warn("wf_rm31: slots temp sensor error %d\n", err);
failure_state |= FAILURE_SENSOR;
wf_control_set_max(slots_fan);
return;
--
2.20.1
next prev parent reply other threads:[~2019-10-18 5:06 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20191018031710.41052-1-wangkefeng.wang@huawei.com>
2019-10-18 3:18 ` [PATCH v2 01/33] alpha: Use pr_warn instead of pr_warning Kefeng Wang
2019-10-18 3:18 ` [PATCH v2 02/33] arm64: " Kefeng Wang
2019-10-18 3:18 ` [PATCH v2 03/33] ia64: " Kefeng Wang
2019-10-18 16:35 ` Luck, Tony
2019-10-18 3:18 ` [PATCH v2 04/33] riscv: " Kefeng Wang
2019-10-18 3:18 ` [PATCH v2 05/33] sh: " Kefeng Wang
2019-10-18 3:18 ` [PATCH v2 06/33] sparc: " Kefeng Wang
2019-10-18 4:58 ` David Miller
2019-10-18 3:18 ` [PATCH v2 07/33] x86: " Kefeng Wang
2019-10-18 3:18 ` [PATCH v2 08/33] acpi: " Kefeng Wang
2019-10-18 3:18 ` [PATCH v2 09/33] drbd: " Kefeng Wang
2019-10-18 3:18 ` [PATCH v2 10/33] gdrom: " Kefeng Wang
2019-10-18 3:18 ` [PATCH v2 11/33] clocksource: samsung_pwm_timer: " Kefeng Wang
2019-10-18 3:18 ` [PATCH v2 12/33] crypto: n2: " Kefeng Wang
2019-10-18 3:18 ` [PATCH v2 13/33] ide: " Kefeng Wang
2019-10-18 3:18 ` [PATCH v2 14/33] idsn: " Kefeng Wang
2019-10-18 3:18 ` Kefeng Wang [this message]
2019-10-18 3:18 ` [PATCH v2 16/33] of: " Kefeng Wang
2019-10-18 3:18 ` [PATCH v2 17/33] oprofile: " Kefeng Wang
2019-10-18 3:18 ` [PATCH v2 18/33] platform/x86: eeepc-laptop: " Kefeng Wang
2019-10-18 7:51 ` Andy Shevchenko
2019-10-18 3:18 ` [PATCH v2 19/33] platform/x86: asus-laptop: " Kefeng Wang
2019-10-18 7:51 ` Andy Shevchenko
2019-10-18 3:18 ` [PATCH v2 20/33] platform/x86: intel_oaktrail: " Kefeng Wang
2019-10-18 7:52 ` Andy Shevchenko
2019-10-18 3:18 ` [PATCH v2 21/33] scsi: " Kefeng Wang
2019-10-18 3:18 ` [PATCH v2 22/33] sh/intc: " Kefeng Wang
2019-10-18 3:18 ` [PATCH v2 23/33] fs: afs: " Kefeng Wang
2019-10-18 3:18 ` [PATCH v2 24/33] vgacon: " Kefeng Wang
2019-10-18 3:18 ` [PATCH v2 25/33] dma-debug: " Kefeng Wang
2019-10-18 3:18 ` [PATCH v2 26/33] trace: " Kefeng Wang
2019-10-18 3:18 ` [PATCH v2 27/33] lib: cpu_rmap: " Kefeng Wang
2019-10-18 3:18 ` [PATCH v2 28/33] ASoC: samsung: " Kefeng Wang
2019-10-18 8:55 ` Sylwester Nawrocki
2019-10-18 3:18 ` [PATCH v2 29/33] printk: Drop pr_warning Kefeng Wang
2019-10-18 3:18 ` [PATCH v2 30/33] tools lib api: Renaming pr_warning to pr_warn Kefeng Wang
2019-10-18 3:18 ` [PATCH v2 31/33] tools lib bpf: " Kefeng Wang
2019-10-18 4:24 ` Alexei Starovoitov
2019-10-18 7:04 ` Petr Mladek
2019-10-18 18:52 ` Daniel Borkmann
2019-10-21 5:55 ` [bpf-next] " Kefeng Wang
2019-10-21 12:55 ` Daniel Borkmann
2019-10-18 3:18 ` [PATCH v2 32/33] tools perf: " Kefeng Wang
2019-10-18 3:18 ` [PATCH v2 33/33] checkpatch: Drop pr_warning check 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=20191018031850.48498-15-wangkefeng.wang@huawei.com \
--to=wangkefeng.wang@huawei.com \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.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