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

Commit 7f96b1ca authored by Ryan Mallon's avatar Ryan Mallon Committed by Russell King
Browse files

[ARM] 5441/1: Use pr_err on error paths in at91 pm 



Change pr_debug to pr_err on error paths in the AT91 power management
code. All of the errors will result in the cpu not going into the
suspend state. This patch makes it possible to identify problems with
suspend when power management debugging is not enabled.

Signed-off-by: default avatarRyan Mallon <ryan@bluewatersys.com>
Acked-by: default avatarAndrew Victor <linux@maxim.org.za>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent f2255be8

arch/arm/mach-at91/pm.c

+4 −4
Original line number Diff line number Diff line
@@ -198,17 +198,17 @@ static int at91_pm_verify_clocks(void) 
	/* USB must not be using PLLB */

	if (cpu_is_at91rm9200()) {

		if ((scsr & (AT91RM9200_PMC_UHP | AT91RM9200_PMC_UDP)) != 0) {

			pr_debug("AT91: PM - Suspend-to-RAM with USB still active\n");

			pr_err("AT91: PM - Suspend-to-RAM with USB still active\n");

			return 0;

		}

	} else if (cpu_is_at91sam9260() || cpu_is_at91sam9261() || cpu_is_at91sam9263() || cpu_is_at91sam9g20()) {

		if ((scsr & (AT91SAM926x_PMC_UHP | AT91SAM926x_PMC_UDP)) != 0) {

			pr_debug("AT91: PM - Suspend-to-RAM with USB still active\n");

			pr_err("AT91: PM - Suspend-to-RAM with USB still active\n");

			return 0;

		}

	} else if (cpu_is_at91cap9()) {

		if ((scsr & AT91CAP9_PMC_UHP) != 0) {

			pr_debug("AT91: PM - Suspend-to-RAM with USB still active\n");

			pr_err("AT91: PM - Suspend-to-RAM with USB still active\n");

			return 0;

		}

	}
@@ -223,7 +223,7 @@ static int at91_pm_verify_clocks(void) 


		css = at91_sys_read(AT91_PMC_PCKR(i)) & AT91_PMC_CSS;

		if (css != AT91_PMC_CSS_SLOW) {

			pr_debug("AT91: PM - Suspend-to-RAM with PCK%d src %d\n", i, css);

			pr_err("AT91: PM - Suspend-to-RAM with PCK%d src %d\n", i, css);

			return 0;

		}

	}