Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Kefeng Wang and committed by
Petr Mladek
2ee9a0db 257daba4

+17 -19
+1 -3
drivers/macintosh/windfarm_fcu_controls.c
··· 468 468 else 469 469 id = ((*reg) - 0x30) / 2; 470 470 if (id > 7) { 471 - pr_warning("wf_fcu: Can't parse " 472 - "fan ID in device-tree for %pOF\n", 473 - np); 471 + pr_warn("wf_fcu: Can't parse fan ID in device-tree for %pOF\n", np); 474 472 break; 475 473 } 476 474 wf_fcu_add_fan(pv, name, type, id);
+2 -2
drivers/macintosh/windfarm_lm87_sensor.c
··· 124 124 } 125 125 } 126 126 if (!name) { 127 - pr_warning("wf_lm87: Unsupported sensor %pOF\n", 128 - client->dev.of_node); 127 + pr_warn("wf_lm87: Unsupported sensor %pOF\n", 128 + client->dev.of_node); 129 129 return -ENODEV; 130 130 } 131 131
+11 -11
drivers/macintosh/windfarm_pm72.c
··· 285 285 /* Apply result directly to exhaust fan */ 286 286 err = wf_control_set(cpu_rear_fans[cpu], sp->target); 287 287 if (err) { 288 - pr_warning("wf_pm72: Fan %s reports error %d\n", 289 - cpu_rear_fans[cpu]->name, err); 288 + pr_warn("wf_pm72: Fan %s reports error %d\n", 289 + cpu_rear_fans[cpu]->name, err); 290 290 failure_state |= FAILURE_FAN; 291 291 break; 292 292 } ··· 296 296 DBG_LOTS(" CPU%d: intake = %d RPM\n", cpu, intake); 297 297 err = wf_control_set(cpu_front_fans[cpu], intake); 298 298 if (err) { 299 - pr_warning("wf_pm72: Fan %s reports error %d\n", 300 - cpu_front_fans[cpu]->name, err); 299 + pr_warn("wf_pm72: Fan %s reports error %d\n", 300 + cpu_front_fans[cpu]->name, err); 301 301 failure_state |= FAILURE_FAN; 302 302 break; 303 303 } ··· 367 367 for (cpu = 0; cpu < nr_chips; cpu++) { 368 368 err = wf_control_set(cpu_rear_fans[cpu], sp->target); 369 369 if (err) { 370 - pr_warning("wf_pm72: Fan %s reports error %d\n", 371 - cpu_rear_fans[cpu]->name, err); 370 + pr_warn("wf_pm72: Fan %s reports error %d\n", 371 + cpu_rear_fans[cpu]->name, err); 372 372 failure_state |= FAILURE_FAN; 373 373 } 374 374 err = wf_control_set(cpu_front_fans[cpu], intake); 375 375 if (err) { 376 - pr_warning("wf_pm72: Fan %s reports error %d\n", 377 - cpu_front_fans[cpu]->name, err); 376 + pr_warn("wf_pm72: Fan %s reports error %d\n", 377 + cpu_front_fans[cpu]->name, err); 378 378 failure_state |= FAILURE_FAN; 379 379 } 380 380 err = 0; 381 381 if (cpu_pumps[cpu]) 382 382 err = wf_control_set(cpu_pumps[cpu], pump); 383 383 if (err) { 384 - pr_warning("wf_pm72: Pump %s reports error %d\n", 385 - cpu_pumps[cpu]->name, err); 384 + pr_warn("wf_pm72: Pump %s reports error %d\n", 385 + cpu_pumps[cpu]->name, err); 386 386 failure_state |= FAILURE_FAN; 387 387 } 388 388 } ··· 561 561 562 562 err = wf_sensor_get(drives_temp, &temp); 563 563 if (err) { 564 - pr_warning("wf_pm72: drive bay temp sensor error %d\n", err); 564 + pr_warn("wf_pm72: drive bay temp sensor error %d\n", err); 565 565 failure_state |= FAILURE_SENSOR; 566 566 wf_control_set_max(drives_fan); 567 567 return;
+3 -3
drivers/macintosh/windfarm_rm31.c
··· 281 281 for (i = 0; i < 3; i++) { 282 282 err = wf_control_set(cpu_fans[cpu][i], speed); 283 283 if (err) { 284 - pr_warning("wf_rm31: Fan %s reports error %d\n", 285 - cpu_fans[cpu][i]->name, err); 284 + pr_warn("wf_rm31: Fan %s reports error %d\n", 285 + cpu_fans[cpu][i]->name, err); 286 286 failure_state |= FAILURE_FAN; 287 287 } 288 288 } ··· 465 465 466 466 err = wf_sensor_get(slots_temp, &temp); 467 467 if (err) { 468 - pr_warning("wf_rm31: slots temp sensor error %d\n", err); 468 + pr_warn("wf_rm31: slots temp sensor error %d\n", err); 469 469 failure_state |= FAILURE_SENSOR; 470 470 wf_control_set_max(slots_fan); 471 471 return;