Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98179856 authored by Mark A. Greer's avatar Mark A. Greer Committed by Kevin Hilman
Browse files

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: default avatarMark A. Greer <mgreer@animalcreek.com>
Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
parent ce229c5d

arch/arm/mach-omap2/pm34xx.c

+10 −12
Original line number Diff line number Diff line
@@ -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,7 +462,7 @@ 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 "

			pr_info("Powerdomain (%s) didn't enter "

				"target state %d\n",

			       pwrst->pwrdm->name, pwrst->next_state);

			ret = -1;
@@ -471,10 +470,9 @@ static int omap3_pm_suspend(void) 
		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,7 +863,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 "

			       "allocating for secure sram context\n");



		local_irq_disable();