Hello. On 16-03-2012 3:07, Mark A. Greer wrote:
From: "Mark A. Greer" <mgreer@xxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxx> --- arch/arm/mach-omap2/pm34xx.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index af8d741..495e509 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c
[...]
@@ -463,7 +462,7 @@ restore: 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 " + pr_info("Powerdomain (%s) didn't enter " "target state %d\n",
Last line should have been realigned I think.
pwrst->pwrdm->name, pwrst->next_state); ret = -1; @@ -471,9 +470,9 @@ restore: 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 " + pr_info("Successfully put all powerdomains " "to target state\n");
Last line should have been realigned I think.
return ret; @@ -865,7 +864,7 @@ 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" + pr_err("Memory allocation failed when"
BTW, space after "when" is missing here.
"allocating for secure sram context\n");
Should have been realigned I think. WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html