macintosh: Use pr_warn instead of pr_warning

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.

Link: http://lkml.kernel.org/r/20191018031850.48498-15-wangkefeng.wang@huawei.com
To: linux-kernel@vger.kernel.org
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Signed-off-by: Petr Mladek <pmladek@suse.com>

diff --git a/drivers/macintosh/windfarm_fcu_controls.c b/drivers/macintosh/windfarm_fcu_controls.c
index 3c971297b6dc207abe1af4e06639ac39ef471dcd..67daeec94b44a06eca49905c7ed86c979c779e52 100644 (file)
--- 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 e44525b19071dce8a56e32070491bf588174bec2..b03a33b803b793c110a911c11610d8b98c0e4880 100644 (file)
--- 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 c5da0fc248841f8b4db3d426ebf3ac18dc418ead..e81746b87cff68e0c4ab3ced219823a65adaefc6 100644 (file)
--- 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 8456eb67184be8758be7bf8141c311004fd30283..7acd1684c451ddfb316677d4c956cad775983f6c 100644 (file)
--- 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;