[PATCH] cpufreq annoying warning fix

The cpufreq core patch I sent earlier got only half-applied.  I added a
flag to let the low level driver disable an annoying warning on
suspend/resume that is normal on ppc, but the "resume" part of it wasn't
applied.

This just adds back that missing bit.  The original patch also reworked
the resume() function to avoid nesting too many if () statements along
the way I did the suspend() one, but I didn't include that in the patch
below.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 4fc0cb79f18f9de8dfa14cf720abf138b88ef627..8e561313d0942571c99de7c19b26f920d355f974 100644 (file)
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -1003,9 +1003,10 @@ static int cpufreq_resume(struct sys_device * sysdev)
                if (unlikely(cur_freq != cpu_policy->cur)) {
                        struct cpufreq_freqs freqs;
 
-                       printk(KERN_WARNING "Warning: CPU frequency is %u, "
-                                       "cpufreq assumed %u kHz.\n",
-                                       cur_freq, cpu_policy->cur);
+                       if (!(cpufreq_driver->flags & CPUFREQ_PM_NO_WARN))
+                               printk(KERN_WARNING "Warning: CPU frequency"
+                                      "is %u, cpufreq assumed %u kHz.\n",
+                                      cur_freq, cpu_policy->cur);
 
                        freqs.cpu = cpu;
                        freqs.old = cpu_policy->cur;