Ricardo Salveti de Araujo <ricardo.salv...@canonical.com> writes:

> 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.salv...@canonical.com>

Thanks, queuing for 2.6.39 in my for_2.6.39/pm-misc branch.

Kevin

> ---
> v1->v2:
> * Use pr_warn instead of printk (Kevin Hilman)
>
>  arch/arm/mach-omap2/cpuidle34xx.c |    2 +-
>  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 f7b22a1..876eeca 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 a4aa192..88f09da 100644
> --- a/arch/arm/mach-omap2/pm34xx.c
> +++ b/arch/arm/mach-omap2/pm34xx.c
> @@ -927,8 +927,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;
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to