OMAP3630: PM: don't warn the user with a trace in case of PM34XX_ERRATUM
authorRicardo Salveti de Araujo <ricardo.salveti@canonical.com>
Mon, 31 Jan 2011 13:35:25 +0000 (11:35 -0200)
committerKevin Hilman <khilman@ti.com>
Thu, 10 Mar 2011 00:15:49 +0000 (16:15 -0800)
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>
arch/arm/mach-omap2/cpuidle34xx.c
arch/arm/mach-omap2/pm34xx.c

index f7b22a1..876eeca 100644 (file)
@@ -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__);
        }
 }
index 2f864e4..6ade4ea 100644 (file)
@@ -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;