提交 98179856 编写于 作者: M Mark A. Greer 提交者: Kevin Hilman

arm: omap3: pm34xx.c: Replace printk() with appropriate pr_*()

Currently, pm34xx.c has a mix of printk() and pr_*() statements
so replace the printk() statements with the equivalent pr_*()
statements.
Signed-off-by: NMark A. Greer <mgreer@animalcreek.com>
Signed-off-by: NKevin Hilman <khilman@ti.com>
上级 ce229c5d
...@@ -166,8 +166,7 @@ static void omap3_save_secure_ram_context(void) ...@@ -166,8 +166,7 @@ static void omap3_save_secure_ram_context(void)
pwrdm_set_next_pwrst(mpu_pwrdm, mpu_next_state); pwrdm_set_next_pwrst(mpu_pwrdm, mpu_next_state);
/* Following is for error tracking, it should not happen */ /* Following is for error tracking, it should not happen */
if (ret) { if (ret) {
printk(KERN_ERR "save_secure_sram() returns %08x\n", pr_err("save_secure_sram() returns %08x\n", ret);
ret);
while (1) while (1)
; ;
} }
...@@ -307,7 +306,7 @@ void omap_sram_idle(void) ...@@ -307,7 +306,7 @@ void omap_sram_idle(void)
break; break;
default: default:
/* Invalid state */ /* Invalid state */
printk(KERN_ERR "Invalid mpu state in sram_idle\n"); pr_err("Invalid mpu state in sram_idle\n");
return; return;
} }
...@@ -463,18 +462,17 @@ static int omap3_pm_suspend(void) ...@@ -463,18 +462,17 @@ static int omap3_pm_suspend(void)
list_for_each_entry(pwrst, &pwrst_list, node) { list_for_each_entry(pwrst, &pwrst_list, node) {
state = pwrdm_read_prev_pwrst(pwrst->pwrdm); state = pwrdm_read_prev_pwrst(pwrst->pwrdm);
if (state > pwrst->next_state) { if (state > pwrst->next_state) {
printk(KERN_INFO "Powerdomain (%s) didn't enter " pr_info("Powerdomain (%s) didn't enter "
"target state %d\n", "target state %d\n",
pwrst->pwrdm->name, pwrst->next_state); pwrst->pwrdm->name, pwrst->next_state);
ret = -1; ret = -1;
} }
omap_set_pwrdm_state(pwrst->pwrdm, pwrst->saved_state); omap_set_pwrdm_state(pwrst->pwrdm, pwrst->saved_state);
} }
if (ret) if (ret)
printk(KERN_ERR "Could not enter target state in pm_suspend\n"); pr_err("Could not enter target state in pm_suspend\n");
else else
printk(KERN_INFO "Successfully put all powerdomains " pr_info("Successfully put all powerdomains to target state\n");
"to target state\n");
return ret; return ret;
} }
...@@ -822,7 +820,7 @@ static int __init omap3_pm_init(void) ...@@ -822,7 +820,7 @@ static int __init omap3_pm_init(void)
ret = pwrdm_for_each(pwrdms_setup, NULL); ret = pwrdm_for_each(pwrdms_setup, NULL);
if (ret) { if (ret) {
printk(KERN_ERR "Failed to setup powerdomains\n"); pr_err("Failed to setup powerdomains\n");
goto err3; goto err3;
} }
...@@ -830,7 +828,7 @@ static int __init omap3_pm_init(void) ...@@ -830,7 +828,7 @@ static int __init omap3_pm_init(void)
mpu_pwrdm = pwrdm_lookup("mpu_pwrdm"); mpu_pwrdm = pwrdm_lookup("mpu_pwrdm");
if (mpu_pwrdm == NULL) { if (mpu_pwrdm == NULL) {
printk(KERN_ERR "Failed to get mpu_pwrdm\n"); pr_err("Failed to get mpu_pwrdm\n");
ret = -EINVAL; ret = -EINVAL;
goto err3; goto err3;
} }
...@@ -865,8 +863,8 @@ static int __init omap3_pm_init(void) ...@@ -865,8 +863,8 @@ static int __init omap3_pm_init(void)
omap3_secure_ram_storage = omap3_secure_ram_storage =
kmalloc(0x803F, GFP_KERNEL); kmalloc(0x803F, GFP_KERNEL);
if (!omap3_secure_ram_storage) if (!omap3_secure_ram_storage)
printk(KERN_ERR "Memory allocation failed when" pr_err("Memory allocation failed when "
"allocating for secure sram context\n"); "allocating for secure sram context\n");
local_irq_disable(); local_irq_disable();
local_fiq_disable(); local_fiq_disable();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册