diff options
author | Ricardo Salveti de Araujo <ricardo.salveti@canonical.com> | 2011-01-31 08:35:25 -0500 |
---|---|---|
committer | Kevin Hilman <khilman@ti.com> | 2011-03-09 19:15:49 -0500 |
commit | e16b41bfd5efaa1f9521449f1f0e341ebec73398 (patch) | |
tree | 3f7eec4728e7fc6afd779777aa6972733515e0b8 /arch/arm/mach-omap2 | |
parent | 126f7e2992760028005ce94509ce54d331c6714d (diff) |
OMAP3630: PM: don't warn the user with a trace in case of PM34XX_ERRATUM
In case in user has a OMAP3630 < ES1.2 the kernel should warn the user
about the ERRATUM, but using pr_warn instead of WARN_ON is already
enough, as there is nothing else the user can do besides changing the
board.
Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r-- | arch/arm/mach-omap2/cpuidle34xx.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/pm34xx.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/cpuidle34xx.c b/arch/arm/mach-omap2/cpuidle34xx.c index f7b22a16f385..876eecab9f4d 100644 --- a/arch/arm/mach-omap2/cpuidle34xx.c +++ b/arch/arm/mach-omap2/cpuidle34xx.c | |||
@@ -464,7 +464,7 @@ void omap_init_power_states(void) | |||
464 | if (IS_PM34XX_ERRATUM(PM_SDRC_WAKEUP_ERRATUM_i583)) { | 464 | if (IS_PM34XX_ERRATUM(PM_SDRC_WAKEUP_ERRATUM_i583)) { |
465 | omap3_power_states[OMAP3_STATE_C7].valid = 0; | 465 | omap3_power_states[OMAP3_STATE_C7].valid = 0; |
466 | cpuidle_params_table[OMAP3_STATE_C7].valid = 0; | 466 | cpuidle_params_table[OMAP3_STATE_C7].valid = 0; |
467 | WARN_ONCE(1, "%s: core off state C7 disabled due to i583\n", | 467 | pr_warn("%s: core off state C7 disabled due to i583\n", |
468 | __func__); | 468 | __func__); |
469 | } | 469 | } |
470 | } | 470 | } |
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index 2f864e4b085d..6ade4eaca922 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c | |||
@@ -928,8 +928,7 @@ void omap3_pm_off_mode_enable(int enable) | |||
928 | pwrst->pwrdm == core_pwrdm && | 928 | pwrst->pwrdm == core_pwrdm && |
929 | state == PWRDM_POWER_OFF) { | 929 | state == PWRDM_POWER_OFF) { |
930 | pwrst->next_state = PWRDM_POWER_RET; | 930 | pwrst->next_state = PWRDM_POWER_RET; |
931 | WARN_ONCE(1, | 931 | pr_warn("%s: Core OFF disabled due to errata i583\n", |
932 | "%s: Core OFF disabled due to errata i583\n", | ||
933 | __func__); | 932 | __func__); |
934 | } else { | 933 | } else { |
935 | pwrst->next_state = state; | 934 | pwrst->next_state = state; |