cpu: convert 'cpu' and 'machinecheck' sysdev_class to a regular subsystem

[deliverable/linux.git] / arch / x86 / kernel / cpu / mcheck / therm_throt.c

diff --git a/arch/x86/kernel/cpu/mcheck/therm_throt.c b/arch/x86/kernel/cpu/mcheck/therm_throt.c
index 27c625178bf11dd8a8e7f3bab162ed611515059d..59e3f6ed265ff16b2d540cca6248215c1977d3ff 100644 (file)
--- a/arch/x86/kernel/cpu/mcheck/therm_throt.c
+++ b/arch/x86/kernel/cpu/mcheck/therm_throt.c
@@ -18,7 +18,7 @@
 #include <linux/jiffies.h>
 #include <linux/kernel.h>
 #include <linux/percpu.h>
-#include <linux/sysdev.h>
+#include <linux/export.h>
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/smp.h>
@@ -68,16 +68,16 @@ static atomic_t therm_throt_en      = ATOMIC_INIT(0);
 static u32 lvtthmr_init __read_mostly;
 
 #ifdef CONFIG_SYSFS
-#define define_therm_throt_sysdev_one_ro(_name)                                \
-       static SYSDEV_ATTR(_name, 0444,                                 \
-                          therm_throt_sysdev_show_##_name,             \
+#define define_therm_throt_device_one_ro(_name)                                \
+       static DEVICE_ATTR(_name, 0444,                                 \
+                          therm_throt_device_show_##_name,             \
                                   NULL)                                \
 
-#define define_therm_throt_sysdev_show_func(event, name)               \
+#define define_therm_throt_device_show_func(event, name)               \
                                                                        \
-static ssize_t therm_throt_sysdev_show_##event##_##name(               \
-                       struct sys_device *dev,                         \
-                       struct sysdev_attribute *attr,                  \
+static ssize_t therm_throt_device_show_##event##_##name(               \
+                       struct device *dev,                             \
+                       struct device_attribute *attr,                  \
                        char *buf)                                      \
 {                                                                      \
        unsigned int cpu = dev->id;                                     \
@@ -94,20 +94,20 @@ static ssize_t therm_throt_sysdev_show_##event##_##name(            \
        return ret;                                                     \
 }
 
-define_therm_throt_sysdev_show_func(core_throttle, count);
-define_therm_throt_sysdev_one_ro(core_throttle_count);
+define_therm_throt_device_show_func(core_throttle, count);
+define_therm_throt_device_one_ro(core_throttle_count);
 
-define_therm_throt_sysdev_show_func(core_power_limit, count);
-define_therm_throt_sysdev_one_ro(core_power_limit_count);
+define_therm_throt_device_show_func(core_power_limit, count);
+define_therm_throt_device_one_ro(core_power_limit_count);
 
-define_therm_throt_sysdev_show_func(package_throttle, count);
-define_therm_throt_sysdev_one_ro(package_throttle_count);
+define_therm_throt_device_show_func(package_throttle, count);
+define_therm_throt_device_one_ro(package_throttle_count);
 
-define_therm_throt_sysdev_show_func(package_power_limit, count);
-define_therm_throt_sysdev_one_ro(package_power_limit_count);
+define_therm_throt_device_show_func(package_power_limit, count);
+define_therm_throt_device_one_ro(package_power_limit_count);
 
 static struct attribute *thermal_throttle_attrs[] = {
-       &attr_core_throttle_count.attr,
+       &dev_attr_core_throttle_count.attr,
        NULL
 };
 
@@ -222,36 +222,36 @@ static int thresh_event_valid(int event)
 
 #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 device *dev,
                                unsigned int cpu)
 {
        int err;
        struct cpuinfo_x86 *c = &cpu_data(cpu);
 
-       err = sysfs_create_group(&sys_dev->kobj, &thermal_attr_group);
+       err = sysfs_create_group(&dev->kobj, &thermal_attr_group);
        if (err)
                return err;
 
        if (cpu_has(c, X86_FEATURE_PLN))
-               err = sysfs_add_file_to_group(&sys_dev->kobj,
-                                             &attr_core_power_limit_count.attr,
+               err = sysfs_add_file_to_group(&dev->kobj,
+                                             &dev_attr_core_power_limit_count.attr,
                                              thermal_attr_group.name);
        if (cpu_has(c, X86_FEATURE_PTS)) {
-               err = sysfs_add_file_to_group(&sys_dev->kobj,
-                                             &attr_package_throttle_count.attr,
+               err = sysfs_add_file_to_group(&dev->kobj,
+                                             &dev_attr_package_throttle_count.attr,
                                              thermal_attr_group.name);
                if (cpu_has(c, X86_FEATURE_PLN))
-                       err = sysfs_add_file_to_group(&sys_dev->kobj,
-                                       &attr_package_power_limit_count.attr,
+                       err = sysfs_add_file_to_group(&dev->kobj,
+                                       &dev_attr_package_power_limit_count.attr,
                                        thermal_attr_group.name);
        }
 
        return err;
 }
 
-static __cpuinit void thermal_throttle_remove_dev(struct sys_device *sys_dev)
+static __cpuinit void thermal_throttle_remove_dev(struct device *dev)
 {
-       sysfs_remove_group(&sys_dev->kobj, &thermal_attr_group);
+       sysfs_remove_group(&dev->kobj, &thermal_attr_group);
 }
 
 /* Mutex protecting device creation against CPU hotplug: */
@@ -264,16 +264,16 @@ thermal_throttle_cpu_callback(struct notifier_block *nfb,
                              void *hcpu)
 {
        unsigned int cpu = (unsigned long)hcpu;
-       struct sys_device *sys_dev;
+       struct device *dev;
        int err = 0;
 
-       sys_dev = get_cpu_sysdev(cpu);
+       dev = get_cpu_device(cpu);
 
        switch (action) {
        case CPU_UP_PREPARE:
        case CPU_UP_PREPARE_FROZEN:
                mutex_lock(&therm_cpu_lock);
-               err = thermal_throttle_add_dev(sys_dev, cpu);
+               err = thermal_throttle_add_dev(dev, cpu);
                mutex_unlock(&therm_cpu_lock);
                WARN_ON(err);
                break;
@@ -282,7 +282,7 @@ thermal_throttle_cpu_callback(struct notifier_block *nfb,
        case CPU_DEAD:
        case CPU_DEAD_FROZEN:
                mutex_lock(&therm_cpu_lock);
-               thermal_throttle_remove_dev(sys_dev);
+               thermal_throttle_remove_dev(dev);
                mutex_unlock(&therm_cpu_lock);
                break;
        }
@@ -309,7 +309,7 @@ static __init int thermal_throttle_init_device(void)
 #endif
        /* connect live CPUs to sysfs */
        for_each_online_cpu(cpu) {
-               err = thermal_throttle_add_dev(get_cpu_sysdev(cpu), cpu);
+               err = thermal_throttle_add_dev(get_cpu_device(cpu), cpu);
                WARN_ON(err);
        }
 #ifdef CONFIG_HOTPLUG_CPU