Merge branch 'cpu_of_node' of git://linux-arm.org/linux-skn into pm-cpufreq-next

[firefly-linux-kernel-4.4.55.git] / drivers / cpufreq / pmac64-cpufreq.c

diff --git a/drivers/cpufreq/pmac64-cpufreq.c b/drivers/cpufreq/pmac64-cpufreq.c
index 97b719f5c744a8d1710f61aaf6ac73e25e1a09fb..3a51ad7e47c8c67c95da5f3691d7f89e397c34a6 100644 (file)
--- a/drivers/cpufreq/pmac64-cpufreq.c
+++ b/drivers/cpufreq/pmac64-cpufreq.c
@@ -372,7 +372,6 @@ static int g5_cpufreq_cpu_init(struct cpufreq_policy *policy)
 
 static struct cpufreq_driver g5_cpufreq_driver = {
        .name           = "powermac",
-       .owner          = THIS_MODULE,
        .flags          = CPUFREQ_CONST_LOOPS,
        .init           = g5_cpufreq_cpu_init,
        .verify         = g5_cpufreq_verify,
@@ -433,9 +432,8 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpunode)
                if (!shdr)
                        goto bail_noprops;
                g5_fvt_table = (struct smu_sdbp_fvt *)&shdr[1];
-               ssize = (shdr->len * sizeof(u32)) -
-                       sizeof(struct smu_sdbp_header);
-               g5_fvt_count = ssize / sizeof(struct smu_sdbp_fvt);
+               ssize = (shdr->len * sizeof(u32)) - sizeof(*shdr);
+               g5_fvt_count = ssize / sizeof(*g5_fvt_table);
                g5_fvt_cur = 0;
 
                /* Sanity checking */