From: Joe Perches <joe@perches.com>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org
Subject: [PATCH 21/35] drivers/macintosh: Convert remaining uses of pr_warning to pr_warn
Date: Thu, 16 Feb 2017 23:11:34 -0800 [thread overview]
Message-ID: <3b11f71725b81463e4aa4bad448b48ef9ebaa424.1487314667.git.joe@perches.com> (raw)
In-Reply-To: <cover.1487314666.git.joe@perches.com>
To enable eventual removal of pr_warning
This makes pr_warn use consistent for drivers/macintosh
Prior to this patch, there were 10 uses of pr_warning and
1 use of pr_warn in drivers/macintosh
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/macintosh/windfarm_fcu_controls.c | 5 ++---
drivers/macintosh/windfarm_lm87_sensor.c | 4 ++--
drivers/macintosh/windfarm_pm72.c | 22 +++++++++++-----------
drivers/macintosh/windfarm_rm31.c | 6 +++---
4 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/drivers/macintosh/windfarm_fcu_controls.c b/drivers/macintosh/windfarm_fcu_controls.c
index 0226b796a21c..3d8d9eaf9b68 100644
--- a/drivers/macintosh/windfarm_fcu_controls.c
+++ b/drivers/macintosh/windfarm_fcu_controls.c
@@ -469,9 +469,8 @@ 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 %s\n",
- np->full_name);
+ pr_warn("wf_fcu: Can't parse fan ID in device-tree for %s\n",
+ np->full_name);
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 c071aab79dd1..93fb8660261d 100644
--- a/drivers/macintosh/windfarm_lm87_sensor.c
+++ b/drivers/macintosh/windfarm_lm87_sensor.c
@@ -126,8 +126,8 @@ static int wf_lm87_probe(struct i2c_client *client,
}
}
if (!name) {
- pr_warning("wf_lm87: Unsupported sensor %s\n",
- client->dev.of_node->full_name);
+ pr_warn("wf_lm87: Unsupported sensor %s\n",
+ client->dev.of_node->full_name);
return -ENODEV;
}
diff --git a/drivers/macintosh/windfarm_pm72.c b/drivers/macintosh/windfarm_pm72.c
index e88cfb36a74d..1d3ac758a0c0 100644
--- a/drivers/macintosh/windfarm_pm72.c
+++ b/drivers/macintosh/windfarm_pm72.c
@@ -286,8 +286,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;
}
@@ -297,8 +297,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;
}
@@ -368,22 +368,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;
}
}
@@ -562,7 +562,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 bdfcb8a8bfbb..8fb3f1aee96e 100644
--- a/drivers/macintosh/windfarm_rm31.c
+++ b/drivers/macintosh/windfarm_rm31.c
@@ -282,8 +282,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;
}
}
@@ -466,7 +466,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.10.0.rc2.1.g053435c
next prev parent reply other threads:[~2017-02-17 7:12 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-17 7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
2017-02-17 7:11 ` [PATCH 01/35] alpha: Convert remaining uses of " Joe Perches
2017-02-17 7:11 ` [PATCH 02/35] ARM: ep93xx: " Joe Perches
2017-02-17 16:26 ` Hartley Sweeten
2017-02-17 7:11 ` [PATCH 03/35] arm64: " Joe Perches
2017-02-17 10:52 ` Mark Rutland
2017-02-17 7:11 ` [PATCH 04/35] arch/blackfin: " Joe Perches
2017-02-17 7:11 ` [PATCH 05/35] ia64: Convert remaining use " Joe Perches
2017-02-17 7:11 ` [PATCH 06/35] powerpc: Convert remaining uses " Joe Perches
2017-02-20 4:40 ` Michael Ellerman
2017-02-20 4:43 ` Joe Perches
2017-02-20 17:25 ` Geoff Levand
2017-02-17 7:11 ` [PATCH 07/35] sh: " Joe Perches
2017-02-17 7:11 ` [PATCH 08/35] sparc: Convert remaining use " Joe Perches
2017-02-17 8:39 ` Sam Ravnborg
2017-02-17 15:20 ` David Miller
2017-02-17 7:11 ` [PATCH 09/35] x86: Convert remaining uses " Joe Perches
2017-02-17 7:46 ` Pekka Paalanen
2017-02-17 8:06 ` Juergen Gross
2017-02-17 11:17 ` Thomas Gleixner
2017-02-17 14:07 ` Robert Richter
2017-02-17 15:01 ` Steven Rostedt
2017-02-21 1:12 ` Adan Hawthorn
2017-02-17 7:11 ` [PATCH 10/35] drivers/acpi: " Joe Perches
2017-02-17 7:11 ` [PATCH 11/35] block/drbd: " Joe Perches
2017-02-17 7:11 ` [PATCH 12/35] gdrom: " Joe Perches
2017-02-17 7:11 ` [PATCH 13/35] drivers/char: Convert remaining use " Joe Perches
2017-02-17 7:53 ` Amit Shah
2017-02-17 7:11 ` [PATCH 14/35] clocksource: " Joe Perches
2017-02-17 7:11 ` [PATCH 15/35] drivers/crypto: Convert remaining uses " Joe Perches
2017-02-17 7:11 ` [PATCH 16/35] fmc: Convert remaining use " Joe Perches
2017-02-17 7:11 ` [PATCH 17/35] drivers/gpu: Convert remaining uses " Joe Perches
2017-02-17 14:22 ` Christian König
2017-02-18 5:03 ` Edward O'Callaghan
2017-02-23 15:02 ` Alex Deucher
2017-02-17 7:11 ` [PATCH 18/35] drivers/ide: " Joe Perches
2017-02-17 15:20 ` David Miller
2017-02-17 7:11 ` [PATCH 19/35] drivers/input: " Joe Perches
2017-02-17 7:11 ` [PATCH 20/35] drivers/isdn: " Joe Perches
2017-02-17 8:49 ` Paul Bolle
2017-02-17 7:11 ` Joe Perches [this message]
2017-02-17 7:11 ` [PATCH 22/35] drivers/media: Convert remaining use " Joe Perches
2017-02-17 7:11 ` [PATCH 23/35] drivers/mfd: Convert remaining uses " Joe Perches
2017-03-14 14:04 ` Lee Jones
2017-03-14 17:17 ` Joe Perches
2017-03-15 12:23 ` Lee Jones
2017-03-15 14:17 ` Joe Perches
2017-03-23 10:52 ` Lee Jones
2017-02-17 7:11 ` [PATCH 24/35] drivers/mtd: " Joe Perches
2017-04-19 20:11 ` Brian Norris
2017-02-17 7:11 ` [PATCH 25/35] drivers/of: " Joe Perches
2017-02-17 7:11 ` [PATCH 26/35] drivers/oprofile: " Joe Perches
2017-02-17 14:07 ` Robert Richter
2017-02-17 7:11 ` [PATCH 27/35] drivers/platform: " Joe Perches
2017-02-17 7:45 ` Andy Shevchenko
2017-02-17 7:11 ` [PATCH 28/35] drivers/rapidio: Convert remaining use " Joe Perches
2017-02-17 7:11 ` [PATCH 29/35] drivers/scsi: " Joe Perches
2017-02-17 7:11 ` [PATCH 30/35] drivers/sh: " Joe Perches
2017-02-17 7:11 ` [PATCH 31/35] drivers/tty: Convert remaining uses " Joe Perches
2017-02-17 7:11 ` [PATCH 32/35] drivers/video: " Joe Perches
2017-03-21 15:17 ` Bartlomiej Zolnierkiewicz
2017-02-17 7:11 ` [PATCH 33/35] kernel/trace: " Joe Perches
2017-02-17 14:59 ` Steven Rostedt
2017-02-17 7:11 ` [PATCH 34/35] lib: " Joe Perches
2017-02-17 7:11 ` [PATCH 35/35] sound/soc: " Joe Perches
2017-02-17 20:28 ` Nicolin Chen
2017-02-17 23:48 ` Mark Brown
2017-02-17 23:57 ` Nicolin Chen
2017-02-18 0:20 ` Joe Perches
2017-02-20 19:06 ` Mark Brown
2017-02-17 12:27 ` [PATCH 00/35] treewide trivial patches converting " Rafael J. Wysocki
2017-02-23 15:28 ` Rob Herring
2017-02-23 17:18 ` Joe Perches
2017-02-23 17:41 ` Emil Velikov
2017-02-23 17:53 ` Joe Perches
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=3b11f71725b81463e4aa4bad448b48ef9ebaa424.1487314667.git.joe@perches.com \
--to=joe@perches.com \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
/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).