[CPUFREQ] Longhaul - Simplier minmult

[sfrench/cifs-2.6.git] / arch / i386 / kernel / cpu / cpufreq / longhaul.c

diff --git a/arch/i386/kernel/cpu/cpufreq/longhaul.c b/arch/i386/kernel/cpu/cpufreq/longhaul.c
index 98fbe28affff4f42c85171a0328d6ca35df8f2c3..8f65ebe4de5b46eb8d13c9b0df3e6ba44266a4d0 100644 (file)
--- a/arch/i386/kernel/cpu/cpufreq/longhaul.c
+++ b/arch/i386/kernel/cpu/cpufreq/longhaul.c
@@ -358,22 +358,15 @@ static int __init longhaul_get_ranges(void)
         * C3 is booting at max anyway. */
        maxmult = mult;
        /* Get min multiplier */
-       switch (longhaul_version) {
-       case TYPE_LONGHAUL_V1:
-       case TYPE_LONGHAUL_V2:
-               minmult = 30;
+       switch (cpu_model) {
+       case CPU_NEHEMIAH:
+               minmult = 50;
                break;
-
-       case TYPE_POWERSAVER:
-               /* Ezra-T */
-               if (cpu_model == CPU_EZRA_T)
-                       minmult = 30;
-               /* Nehemiah */
-               else if (cpu_model == CPU_NEHEMIAH)
-                       minmult = 50;
-               /* Nehemiah C */
-               else if (cpu_model == CPU_NEHEMIAH_C)
-                       minmult = 40;
+       case CPU_NEHEMIAH_C:
+               minmult = 40;
+               break;
+       default:
+               minmult = 30;
                break;
        }