brain-hackers_pepepper-mirror/linux-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/linux-brain.git synced 2024-06-09 23:36:23 +09:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Currently, pm34xx.c has a mix of printk() and pr_*() statements
so replace the printk() statements with the equivalent pr_*()
statements.

Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
This commit is contained in:
Mark A. Greer 2012-03-17 18:22:48 -07:00 committed by Kevin Hilman
parent ce229c5d79
commit 981798569b
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arch/arm/mach-omap2/pm34xx.c
View File

@ -166,8 +166,7 @@ static void omap3_save_secure_ram_context(void)
pwrdm_set_next_pwrst(mpu_pwrdm, mpu_next_state);
/* Following is for error tracking, it should not happen */
if (ret) {
printk(KERN_ERR "save_secure_sram() returns %08x\n",
ret);
pr_err("save_secure_sram() returns %08x\n", ret);
while (1)
;
}
@ -307,7 +306,7 @@ void omap_sram_idle(void)
break;
default:
/* Invalid state */
printk(KERN_ERR "Invalid mpu state in sram_idle\n");
pr_err("Invalid mpu state in sram_idle\n");
return;
}
@ -463,18 +462,17 @@ static int omap3_pm_suspend(void)
list_for_each_entry(pwrst, &pwrst_list, node) {
state = pwrdm_read_prev_pwrst(pwrst->pwrdm);
if (state > pwrst->next_state) {
printk(KERN_INFO "Powerdomain (%s) didn't enter "
"target state %d\n",
pr_info("Powerdomain (%s) didn't enter "
"target state %d\n",
pwrst->pwrdm->name, pwrst->next_state);
ret = -1;
}
omap_set_pwrdm_state(pwrst->pwrdm, pwrst->saved_state);
}
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
printk(KERN_INFO "Successfully put all powerdomains "
"to target state\n");
pr_info("Successfully put all powerdomains to target state\n");
return ret;
}
@ -822,7 +820,7 @@ static int __init omap3_pm_init(void)
ret = pwrdm_for_each(pwrdms_setup, NULL);
if (ret) {
printk(KERN_ERR "Failed to setup powerdomains\n");
pr_err("Failed to setup powerdomains\n");
goto err3;
}
@ -830,7 +828,7 @@ static int __init omap3_pm_init(void)
mpu_pwrdm = pwrdm_lookup("mpu_pwrdm");
if (mpu_pwrdm == NULL) {
printk(KERN_ERR "Failed to get mpu_pwrdm\n");
pr_err("Failed to get mpu_pwrdm\n");
ret = -EINVAL;
goto err3;
}
@ -865,8 +863,8 @@ static int __init omap3_pm_init(void)
omap3_secure_ram_storage =
kmalloc(0x803F, GFP_KERNEL);
if (!omap3_secure_ram_storage)
printk(KERN_ERR "Memory allocation failed when"
"allocating for secure sram context\n");
pr_err("Memory allocation failed when "
"allocating for secure sram context\n");
local_irq_disable();
local_fiq_disable();