diff options
| author | Ricardo Salveti de Araujo <ricardo.salveti@canonical.com> | 2011-01-31 14:35:25 +0100 |
|---|---|---|
| committer | Kevin Hilman <khilman@ti.com> | 2011-03-10 01:15:49 +0100 |
| commit | e16b41bfd5efaa1f9521449f1f0e341ebec73398 (patch) | |
| tree | 3f7eec4728e7fc6afd779777aa6972733515e0b8 | |
| parent | MAINTAINERS: update Kevin's email for OMAP PM section (diff) | |
| download | linux-e16b41bfd5efaa1f9521449f1f0e341ebec73398.tar.xz linux-e16b41bfd5efaa1f9521449f1f0e341ebec73398.zip | |
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>
| -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) if (IS_PM34XX_ERRATUM(PM_SDRC_WAKEUP_ERRATUM_i583)) { omap3_power_states[OMAP3_STATE_C7].valid = 0; cpuidle_params_table[OMAP3_STATE_C7].valid = 0; - WARN_ONCE(1, "%s: core off state C7 disabled due to i583\n", + pr_warn("%s: core off state C7 disabled due to i583\n", __func__); } } 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) pwrst->pwrdm == core_pwrdm && state == PWRDM_POWER_OFF) { pwrst->next_state = PWRDM_POWER_RET; - WARN_ONCE(1, - "%s: Core OFF disabled due to errata i583\n", + pr_warn("%s: Core OFF disabled due to errata i583\n", __func__); } else { pwrst->next_state = state; |