powernow-k8: delay info messages until initialization has succeeded

powernow-k8 is quite prematurely crying Hooray and outputs diagnostic
messages, although the actual initialization can still fail.
Since now we may have acpi-cpufreq already loaded, we move the
messages at the end of the init routine to avoid confusing output
if the loading of powernow-k8 should not succeed.

Signed-off-by: Andre Przywara <andre.przywara@amd.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

1 files changed, 14 insertions, 10 deletions

diff --git a/drivers/cpufreq/powernow-k8.c b/drivers/cpufreq/powernow-k8.c
index e2defb822bb1..f1035a920b0a 100644
--- a/drivers/cpufreq/powernow-k8.c
+++ b/drivers/cpufreq/powernow-k8.c
@@ -1576,9 +1576,6 @@ static int __cpuinit powernowk8_init(void)
         if (supported_cpus != num_online_cpus())
                 return -ENODEV;
 
-        printk(KERN_INFO PFX "Found %d %s (%d cpu cores) (" VERSION ")\n",
-                num_online_nodes(), boot_cpu_data.x86_model_id, supported_cpus);
-
         if (boot_cpu_has(X86_FEATURE_CPB)) {
 
                 cpb_capable = true;
@@ -1597,16 +1594,23 @@ static int __cpuinit powernowk8_init(void)
                         struct msr *reg = per_cpu_ptr(msrs, cpu);
                         cpb_enabled |= !(!!(reg->l & BIT(25)));
                 }
-
-                printk(KERN_INFO PFX "Core Performance Boosting: %s.\n",
-                        (cpb_enabled ? "on" : "off"));
         }
 
         rv = cpufreq_register_driver(&cpufreq_amd64_driver);
-        if (rv < 0 && boot_cpu_has(X86_FEATURE_CPB)) {
-                unregister_cpu_notifier(&cpb_nb);
-                msrs_free(msrs);
-                msrs = NULL;
+
+        if (!rv)
+                pr_info(PFX "Found %d %s (%d cpu cores) (" VERSION ")\n",
+                        num_online_nodes(), boot_cpu_data.x86_model_id,
+                        supported_cpus);
+
+        if (boot_cpu_has(X86_FEATURE_CPB)) {
+                if (rv < 0) {
+                        unregister_cpu_notifier(&cpb_nb);
+                        msrs_free(msrs);
+                        msrs = NULL;
+                } else
+                        pr_info(PFX "Core Performance Boosting: %s.\n",
+                                (cpb_enabled ? "on" : "off"));
         }
         return rv;
 }