Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

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

diff --git a/drivers/cpufreq/pmac64-cpufreq.c b/drivers/cpufreq/pmac64-cpufreq.c
index 7ba423431cfe0dfb53fcbe3c7f7195882c36ac3d..3a51ad7e47c8c67c95da5f3691d7f89e397c34a6 100644 (file)
--- a/drivers/cpufreq/pmac64-cpufreq.c
+++ b/drivers/cpufreq/pmac64-cpufreq.c
@@ -22,6 +22,7 @@
 #include <linux/init.h>
 #include <linux/completion.h>
 #include <linux/mutex.h>
+#include <linux/of_device.h>
 #include <asm/prom.h>
 #include <asm/machdep.h>
 #include <asm/irq.h>
@@ -371,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,
@@ -383,9 +383,8 @@ static struct cpufreq_driver g5_cpufreq_driver = {
 
 #ifdef CONFIG_PMAC_SMU
 
-static int __init g5_neo2_cpufreq_init(struct device_node *cpus)
+static int __init g5_neo2_cpufreq_init(struct device_node *cpunode)
 {
-       struct device_node *cpunode;
        unsigned int psize, ssize;
        unsigned long max_freq;
        char *freq_method, *volt_method;
@@ -405,20 +404,6 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpus)
        else
                return -ENODEV;
 
-       /* Get first CPU node */
-       for (cpunode = NULL;
-            (cpunode = of_get_next_child(cpus, cpunode)) != NULL;) {
-               const u32 *reg = of_get_property(cpunode, "reg", NULL);
-               if (reg == NULL || (*reg) != 0)
-                       continue;
-               if (!strcmp(cpunode->type, "cpu"))
-                       break;
-       }
-       if (cpunode == NULL) {
-               printk(KERN_ERR "cpufreq: Can't find any CPU 0 node\n");
-               return -ENODEV;
-       }
-
        /* Check 970FX for now */
        valp = of_get_property(cpunode, "cpu-version", NULL);
        if (!valp) {
@@ -447,9 +432,8 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpus)
                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 */
@@ -537,9 +521,9 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpus)
 #endif /* CONFIG_PMAC_SMU */
 
 
-static int __init g5_pm72_cpufreq_init(struct device_node *cpus)
+static int __init g5_pm72_cpufreq_init(struct device_node *cpunode)
 {
-       struct device_node *cpuid = NULL, *hwclock = NULL, *cpunode = NULL;
+       struct device_node *cpuid = NULL, *hwclock = NULL;
        const u8 *eeprom = NULL;
        const u32 *valp;
        u64 max_freq, min_freq, ih, il;
@@ -548,17 +532,6 @@ static int __init g5_pm72_cpufreq_init(struct device_node *cpus)
        DBG("cpufreq: Initializing for PowerMac7,2, PowerMac7,3 and"
            " RackMac3,1...\n");
 
-       /* Get first CPU node */
-       for (cpunode = NULL;
-            (cpunode = of_get_next_child(cpus, cpunode)) != NULL;) {
-               if (!strcmp(cpunode->type, "cpu"))
-                       break;
-       }
-       if (cpunode == NULL) {
-               printk(KERN_ERR "cpufreq: Can't find any CPU node\n");
-               return -ENODEV;
-       }
-
        /* Lookup the cpuid eeprom node */
         cpuid = of_find_node_by_path("/u3@0,f8000000/i2c@f8001000/cpuid@a0");
        if (cpuid != NULL)
@@ -718,25 +691,25 @@ static int __init g5_pm72_cpufreq_init(struct device_node *cpus)
 
 static int __init g5_cpufreq_init(void)
 {
-       struct device_node *cpus;
+       struct device_node *cpunode;
        int rc = 0;
 
-       cpus = of_find_node_by_path("/cpus");
-       if (cpus == NULL) {
-               DBG("No /cpus node !\n");
+       /* Get first CPU node */
+       cpunode = of_cpu_device_node_get(0);
+       if (cpunode == NULL) {
+               pr_err("cpufreq: Can't find any CPU node\n");
                return -ENODEV;
        }
 
        if (of_machine_is_compatible("PowerMac7,2") ||
            of_machine_is_compatible("PowerMac7,3") ||
            of_machine_is_compatible("RackMac3,1"))
-               rc = g5_pm72_cpufreq_init(cpus);
+               rc = g5_pm72_cpufreq_init(cpunode);
 #ifdef CONFIG_PMAC_SMU
        else
-               rc = g5_neo2_cpufreq_init(cpus);
+               rc = g5_neo2_cpufreq_init(cpunode);
 #endif /* CONFIG_PMAC_SMU */
 
-       of_node_put(cpus);
        return rc;
 }