cpufreq: e_powersaver: don't initialize part of policy set by core

[karo-tx-linux.git] / drivers / cpufreq / powernow-k7.c

diff --git a/drivers/cpufreq/powernow-k7.c b/drivers/cpufreq/powernow-k7.c
index 9558708779350a9b00ee6951241ac9bf24551766..14cd98f5a096657acbec65249e27a01a39fb22fa 100644 (file)
--- a/drivers/cpufreq/powernow-k7.c
+++ b/drivers/cpufreq/powernow-k7.c
@@ -177,7 +177,7 @@ static int get_ranges(unsigned char *pst)
        unsigned int speed;
        u8 fid, vid;
 
-       powernow_table = kzalloc((sizeof(struct cpufreq_frequency_table) *
+       powernow_table = kzalloc((sizeof(*powernow_table) *
                                (number_scales + 1)), GFP_KERNEL);
        if (!powernow_table)
                return -ENOMEM;
@@ -309,8 +309,7 @@ static int powernow_acpi_init(void)
                goto err0;
        }
 
-       acpi_processor_perf = kzalloc(sizeof(struct acpi_processor_performance),
-                                     GFP_KERNEL);
+       acpi_processor_perf = kzalloc(sizeof(*acpi_processor_perf), GFP_KERNEL);
        if (!acpi_processor_perf) {
                retval = -ENOMEM;
                goto err0;
@@ -346,7 +345,7 @@ static int powernow_acpi_init(void)
                goto err2;
        }
 
-       powernow_table = kzalloc((sizeof(struct cpufreq_frequency_table) *
+       powernow_table = kzalloc((sizeof(*powernow_table) *
                                (number_scales + 1)), GFP_KERNEL);
        if (!powernow_table) {
                retval = -ENOMEM;
@@ -497,7 +496,7 @@ static int powernow_decode_bios(int maxfid, int startvid)
                                        "relevant to this CPU).\n",
                                        psb->numpst);
 
-                       p += sizeof(struct psb_s);
+                       p += sizeof(*psb);
 
                        pst = (struct pst_s *) p;
 
@@ -510,12 +509,12 @@ static int powernow_decode_bios(int maxfid, int startvid)
                                    (maxfid == pst->maxfid) &&
                                    (startvid == pst->startvid)) {
                                        print_pst_entry(pst, j);
-                                       p = (char *)pst + sizeof(struct pst_s);
+                                       p = (char *)pst + sizeof(*pst);
                                        ret = get_ranges(p);
                                        return ret;
                                } else {
                                        unsigned int k;
-                                       p = (char *)pst + sizeof(struct pst_s);
+                                       p = (char *)pst + sizeof(*pst);
                                        for (k = 0; k < number_scales; k++)
                                                p += 2;
                                }
@@ -550,11 +549,6 @@ static int powernow_target(struct cpufreq_policy *policy,
 }
 
 
-static int powernow_verify(struct cpufreq_policy *policy)
-{
-       return cpufreq_frequency_table_verify(policy, powernow_table);
-}
-
 /*
  * We use the fact that the bus frequency is somehow
  * a multiple of 100000/3 khz, then we compute sgtc according
@@ -681,9 +675,7 @@ static int powernow_cpu_init(struct cpufreq_policy *policy)
 
        policy->cur = powernow_get(0);
 
-       cpufreq_frequency_table_get_attr(powernow_table, policy->cpu);
-
-       return cpufreq_frequency_table_cpuinfo(policy, powernow_table);
+       return cpufreq_table_validate_and_show(policy, powernow_table);
 }
 
 static int powernow_cpu_exit(struct cpufreq_policy *policy)
@@ -702,13 +694,8 @@ static int powernow_cpu_exit(struct cpufreq_policy *policy)
        return 0;
 }
 
-static struct freq_attr *powernow_table_attr[] = {
-       &cpufreq_freq_attr_scaling_available_freqs,
-       NULL,
-};
-
 static struct cpufreq_driver powernow_driver = {
-       .verify         = powernow_verify,
+       .verify         = cpufreq_generic_frequency_table_verify,
        .target         = powernow_target,
        .get            = powernow_get,
 #ifdef CONFIG_X86_POWERNOW_K7_ACPI
@@ -717,8 +704,7 @@ static struct cpufreq_driver powernow_driver = {
        .init           = powernow_cpu_init,
        .exit           = powernow_cpu_exit,
        .name           = "powernow-k7",
-       .owner          = THIS_MODULE,
-       .attr           = powernow_table_attr,
+       .attr           = cpufreq_generic_attr,
 };
 
 static int __init powernow_init(void)