Merge branch 'intx' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6

[pandora-kernel.git] / arch / i386 / kernel / cpu / mcheck / therm_throt.c

diff --git a/arch/i386/kernel/cpu/mcheck/therm_throt.c b/arch/i386/kernel/cpu/mcheck/therm_throt.c
index 4f43047..065005c 100644 (file)
--- a/arch/i386/kernel/cpu/mcheck/therm_throt.c
+++ b/arch/i386/kernel/cpu/mcheck/therm_throt.c
@@ -20,6 +20,7 @@
 #include <linux/cpu.h>
 #include <asm/cpu.h>
 #include <linux/notifier.h>
+#include <linux/jiffies.h>
 #include <asm/therm_throt.h>
 
 /* How long to wait between reporting thermal events */
@@ -110,17 +111,14 @@ int therm_throt_process(int curr)
 
 #ifdef CONFIG_SYSFS
 /* Add/Remove thermal_throttle interface for CPU device */
-static __cpuinit int thermal_throttle_add_dev(struct sys_device * sys_dev)
+static __cpuinit int thermal_throttle_add_dev(struct sys_device *sys_dev)
 {
-       sysfs_create_group(&sys_dev->kobj, &thermal_throttle_attr_group);
-       return 0;
+       return sysfs_create_group(&sys_dev->kobj, &thermal_throttle_attr_group);
 }
 
-#ifdef CONFIG_HOTPLUG_CPU
-static __cpuinit int thermal_throttle_remove_dev(struct sys_device * sys_dev)
+static __cpuinit void thermal_throttle_remove_dev(struct sys_device *sys_dev)
 {
-       sysfs_remove_group(&sys_dev->kobj, &thermal_throttle_attr_group);
-       return 0;
+       return sysfs_remove_group(&sys_dev->kobj, &thermal_throttle_attr_group);
 }
 
 /* Mutex protecting device creation against CPU hotplug */
@@ -133,12 +131,14 @@ static __cpuinit int thermal_throttle_cpu_callback(struct notifier_block *nfb,
 {
        unsigned int cpu = (unsigned long)hcpu;
        struct sys_device *sys_dev;
+       int err;
 
        sys_dev = get_cpu_sysdev(cpu);
        mutex_lock(&therm_cpu_lock);
        switch (action) {
        case CPU_ONLINE:
-               thermal_throttle_add_dev(sys_dev);
+               err = thermal_throttle_add_dev(sys_dev);
+               WARN_ON(err);
                break;
        case CPU_DEAD:
                thermal_throttle_remove_dev(sys_dev);
@@ -152,11 +152,11 @@ static struct notifier_block thermal_throttle_cpu_notifier =
 {
        .notifier_call = thermal_throttle_cpu_callback,
 };
-#endif /* CONFIG_HOTPLUG_CPU */
 
 static __init int thermal_throttle_init_device(void)
 {
        unsigned int cpu = 0;
+       int err;
 
        if (!atomic_read(&therm_throt_en))
                return 0;
@@ -167,8 +167,10 @@ static __init int thermal_throttle_init_device(void)
        mutex_lock(&therm_cpu_lock);
 #endif
        /* connect live CPUs to sysfs */
-       for_each_online_cpu(cpu)
-               thermal_throttle_add_dev(get_cpu_sysdev(cpu));
+       for_each_online_cpu(cpu) {
+               err = thermal_throttle_add_dev(get_cpu_sysdev(cpu));
+               WARN_ON(err);
+       }
 #ifdef CONFIG_HOTPLUG_CPU
        mutex_unlock(&therm_cpu_lock);
 #endif