aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>2008-01-18 15:32:14 -0500
committerPaul Mackerras <paulus@samba.org>2008-01-25 06:52:52 -0500
commiteff56c92a15c3dbb1e55efea5251e28c0e5efb8b (patch)
tree51f8a55bc2b9dc553cecbe566e3786f51dd3d5a7
parentad7d8193e49c5534f76f87b22a6fd80e39be96cc (diff)
[POWERPC] PS3: Checkpatch cleanups for drivers/ps3/ps3-sys-manager.c
Cleanup coding errors in drivers/ps3/ps3-sys-manager.c as reported by checkpatch. Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com> Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--drivers/ps3/ps3-sys-manager.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/ps3/ps3-sys-manager.c b/drivers/ps3/ps3-sys-manager.c
index 8461b08ab9fb..c3c3aba3ffce 100644
--- a/drivers/ps3/ps3-sys-manager.c
+++ b/drivers/ps3/ps3-sys-manager.c
@@ -452,7 +452,7 @@ static int ps3_sys_manager_handle_event(struct ps3_system_bus_device *dev)
452 case PS3_SM_EVENT_THERMAL_ALERT: 452 case PS3_SM_EVENT_THERMAL_ALERT:
453 dev_dbg(&dev->core, "%s:%d: THERMAL_ALERT (zone %u)\n", 453 dev_dbg(&dev->core, "%s:%d: THERMAL_ALERT (zone %u)\n",
454 __func__, __LINE__, event.value); 454 __func__, __LINE__, event.value);
455 printk(KERN_INFO "PS3 Thermal Alert Zone %u\n", event.value); 455 pr_info("PS3 Thermal Alert Zone %u\n", event.value);
456 break; 456 break;
457 case PS3_SM_EVENT_THERMAL_CLEARED: 457 case PS3_SM_EVENT_THERMAL_CLEARED:
458 dev_dbg(&dev->core, "%s:%d: THERMAL_CLEARED (zone %u)\n", 458 dev_dbg(&dev->core, "%s:%d: THERMAL_CLEARED (zone %u)\n",
@@ -488,7 +488,7 @@ static int ps3_sys_manager_handle_cmd(struct ps3_system_bus_device *dev)
488 result = ps3_vuart_read(dev, &cmd, sizeof(cmd)); 488 result = ps3_vuart_read(dev, &cmd, sizeof(cmd));
489 BUG_ON(result && "need to retry here"); 489 BUG_ON(result && "need to retry here");
490 490
491 if(result) 491 if (result)
492 return result; 492 return result;
493 493
494 if (cmd.version != 1) { 494 if (cmd.version != 1) {
@@ -521,7 +521,7 @@ static int ps3_sys_manager_handle_msg(struct ps3_system_bus_device *dev)
521 result = ps3_vuart_read(dev, &header, 521 result = ps3_vuart_read(dev, &header,
522 sizeof(struct ps3_sys_manager_header)); 522 sizeof(struct ps3_sys_manager_header));
523 523
524 if(result) 524 if (result)
525 return result; 525 return result;
526 526
527 if (header.version != 1) { 527 if (header.version != 1) {
@@ -589,9 +589,9 @@ static void ps3_sys_manager_final_power_off(struct ps3_system_bus_device *dev)
589 PS3_SM_WAKE_DEFAULT); 589 PS3_SM_WAKE_DEFAULT);
590 ps3_sys_manager_send_request_shutdown(dev); 590 ps3_sys_manager_send_request_shutdown(dev);
591 591
592 printk(KERN_EMERG "System Halted, OK to turn off power\n"); 592 pr_emerg("System Halted, OK to turn off power\n");
593 593
594 while(1) 594 while (1)
595 ps3_sys_manager_handle_msg(dev); 595 ps3_sys_manager_handle_msg(dev);
596} 596}
597 597
@@ -626,9 +626,9 @@ static void ps3_sys_manager_final_restart(struct ps3_system_bus_device *dev)
626 PS3_SM_WAKE_DEFAULT); 626 PS3_SM_WAKE_DEFAULT);
627 ps3_sys_manager_send_request_shutdown(dev); 627 ps3_sys_manager_send_request_shutdown(dev);
628 628
629 printk(KERN_EMERG "System Halted, OK to turn off power\n"); 629 pr_emerg("System Halted, OK to turn off power\n");
630 630
631 while(1) 631 while (1)
632 ps3_sys_manager_handle_msg(dev); 632 ps3_sys_manager_handle_msg(dev);
633} 633}
634 634