Commit 2ee9a0db authored by Kefeng Wang's avatar Kefeng Wang Committed by Petr Mladek
Browse files

macintosh: Use pr_warn instead of pr_warning 

As said in commit f2c2cbcc ("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: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: default avatarSergey Senozhatsky <sergey.senozhatsky@gmail.com>
Signed-off-by: default avatarPetr Mladek <pmladek@suse.com>
parent 257daba4

drivers/macintosh/windfarm_fcu_controls.c

+1 −3
Original line number Diff line number Diff line
@@ -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);

drivers/macintosh/windfarm_lm87_sensor.c

+2 −2
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static int wf_lm87_probe(struct i2c_client *client, 
		}

	}

	if (!name) {

		pr_warning("wf_lm87: Unsupported sensor %pOF\n",

		pr_warn("wf_lm87: Unsupported sensor %pOF\n",

			client->dev.of_node);

		return -ENODEV;

	}

drivers/macintosh/windfarm_pm72.c

+11 −11
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ 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",

			pr_warn("wf_pm72: Fan %s reports error %d\n",

				cpu_rear_fans[cpu]->name, err);

			failure_state |= FAILURE_FAN;

			break;
@@ -296,7 +296,7 @@ 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",

			pr_warn("wf_pm72: Fan %s reports error %d\n",

				cpu_front_fans[cpu]->name, err);

			failure_state |= FAILURE_FAN;

			break;
@@ -367,13 +367,13 @@ 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",

			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",

			pr_warn("wf_pm72: Fan %s reports error %d\n",

				cpu_front_fans[cpu]->name, err);

			failure_state |= FAILURE_FAN;

		}
@@ -381,7 +381,7 @@ static void cpu_fans_tick_combined(void) 
		if (cpu_pumps[cpu])

			err = wf_control_set(cpu_pumps[cpu], pump);

		if (err) {

			pr_warning("wf_pm72: Pump %s reports error %d\n",

			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;

drivers/macintosh/windfarm_rm31.c

+3 −3
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ 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",

				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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE