Merge ../linus
authorDave Jones <davej@redhat.com>
Tue, 18 Apr 2006 22:19:55 +0000 (17:19 -0500)
committerDave Jones <davej@redhat.com>
Tue, 18 Apr 2006 22:19:55 +0000 (17:19 -0500)
Documentation/cpu-freq/index.txt
drivers/cpufreq/Kconfig
drivers/cpufreq/cpufreq.c
drivers/cpufreq/cpufreq_conservative.c

index 5009805f9378b6b60a566da9e9644be0dc34acfc..ffdb5323df378b84963e4f91cd1470ff17865b6d 100644 (file)
@@ -53,4 +53,4 @@ the CPUFreq Mailing list:
 * http://lists.linux.org.uk/mailman/listinfo/cpufreq
 
 Clock and voltage scaling for the SA-1100:
-* http://www.lart.tudelft.nl/projects/scaling
+* http://www.lartmaker.nl/projects/scaling
index 60c9be99c6d91244f311dccd2837f49e00b14e87..2cc71b66231ec07e81d7221578f040c6fdcaeed0 100644 (file)
@@ -99,7 +99,7 @@ config CPU_FREQ_GOV_USERSPACE
          Enable this cpufreq governor when you either want to set the
          CPU frequency manually or when an userspace program shall
          be able to set the CPU dynamically, like on LART 
-         <http://www.lart.tudelft.nl/>
+         <http://www.lartmaker.nl/>.
 
          For details, take a look at <file:Documentation/cpu-freq/>.
 
index 9b6ae7dc8b8a3a736666568fad41c3b8b567210d..3d0430741b5a2974924ce5ff35815e75d9422e9e 100644 (file)
@@ -685,7 +685,7 @@ static int cpufreq_add_dev (struct sys_device * sys_dev)
                if (!cpu_online(j))
                        continue;
 
-               dprintk("CPU already managed, adding link\n");
+               dprintk("CPU %u already managed, adding link\n", j);
                cpufreq_cpu_get(cpu);
                cpu_sys_dev = get_cpu_sysdev(j);
                sysfs_create_link(&cpu_sys_dev->kobj, &policy->kobj,
@@ -695,9 +695,8 @@ static int cpufreq_add_dev (struct sys_device * sys_dev)
        policy->governor = NULL; /* to assure that the starting sequence is
                                  * run in cpufreq_set_policy */
        mutex_unlock(&policy->lock);
-       
+
        /* set default policy */
-       
        ret = cpufreq_set_policy(&new_policy);
        if (ret) {
                dprintk("setting policy failed\n");
@@ -707,7 +706,7 @@ static int cpufreq_add_dev (struct sys_device * sys_dev)
        module_put(cpufreq_driver->owner);
        dprintk("initialization complete\n");
        cpufreq_debug_enable_ratelimit();
-       
+
        return 0;
 
 
index 037f6bf4543c3c29b98e6401d8cb242b85a2f993..e07a35487bde7cf5b713c0c203a4819a537ae901 100644 (file)
@@ -176,8 +176,7 @@ static ssize_t store_up_threshold(struct cpufreq_policy *unused,
        ret = sscanf (buf, "%u", &input);
 
        mutex_lock(&dbs_mutex);
-       if (ret != 1 || input > 100 || input < 0 ||
-                       input <= dbs_tuners_ins.down_threshold) {
+       if (ret != 1 || input > 100 || input <= dbs_tuners_ins.down_threshold) {
                mutex_unlock(&dbs_mutex);
                return -EINVAL;
        }
@@ -196,8 +195,7 @@ static ssize_t store_down_threshold(struct cpufreq_policy *unused,
        ret = sscanf (buf, "%u", &input);
 
        mutex_lock(&dbs_mutex);
-       if (ret != 1 || input > 100 || input < 0 ||
-                       input >= dbs_tuners_ins.up_threshold) {
+       if (ret != 1 || input > 100 || input >= dbs_tuners_ins.up_threshold) {
                mutex_unlock(&dbs_mutex);
                return -EINVAL;
        }