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

[deliverable/linux.git] / arch / powerpc / platforms / cell / cbe_thermal.c

diff --git a/arch/powerpc/platforms/cell/cbe_thermal.c b/arch/powerpc/platforms/cell/cbe_thermal.c
index 4d4c8c169124eb8899315bf97c895c4e22a8919f..94560db788bfe30327013dadcd94ec3a1eb6aebb 100644 (file)
--- a/arch/powerpc/platforms/cell/cbe_thermal.c
+++ b/arch/powerpc/platforms/cell/cbe_thermal.c
@@ -46,7 +46,7 @@
  */
 
 #include <linux/module.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/kernel.h>
 #include <linux/cpu.h>
 #include <asm/spu.h>
@@ -59,8 +59,8 @@
 #define TEMP_MIN 65
 #define TEMP_MAX 125
 
-#define SYSDEV_PREFIX_ATTR(_prefix,_name,_mode)                        \
-struct sysdev_attribute attr_ ## _prefix ## _ ## _name = {     \
+#define DEVICE_PREFIX_ATTR(_prefix,_name,_mode)                        \
+struct device_attribute attr_ ## _prefix ## _ ## _name = {     \
        .attr = { .name = __stringify(_name), .mode = _mode },  \
        .show   = _prefix ## _show_ ## _name,                   \
        .store  = _prefix ## _store_ ## _name,                  \
@@ -76,36 +76,36 @@ static inline u8 temp_to_reg(u8 temp)
        return ((temp - TEMP_MIN) >> 1) & 0x3f;
 }
 
-static struct cbe_pmd_regs __iomem *get_pmd_regs(struct sys_device *sysdev)
+static struct cbe_pmd_regs __iomem *get_pmd_regs(struct device *dev)
 {
        struct spu *spu;
 
-       spu = container_of(sysdev, struct spu, sysdev);
+       spu = container_of(dev, struct spu, dev);
 
        return cbe_get_pmd_regs(spu_devnode(spu));
 }
 
 /* returns the value for a given spu in a given register */
-static u8 spu_read_register_value(struct sys_device *sysdev, union spe_reg __iomem *reg)
+static u8 spu_read_register_value(struct device *dev, union spe_reg __iomem *reg)
 {
        union spe_reg value;
        struct spu *spu;
 
-       spu = container_of(sysdev, struct spu, sysdev);
+       spu = container_of(dev, struct spu, dev);
        value.val = in_be64(&reg->val);
 
        return value.spe[spu->spe_id];
 }
 
-static ssize_t spu_show_temp(struct sys_device *sysdev, struct sysdev_attribute *attr,
+static ssize_t spu_show_temp(struct device *dev, struct device_attribute *attr,
                        char *buf)
 {
        u8 value;
        struct cbe_pmd_regs __iomem *pmd_regs;
 
-       pmd_regs = get_pmd_regs(sysdev);
+       pmd_regs = get_pmd_regs(dev);
 
-       value = spu_read_register_value(sysdev, &pmd_regs->ts_ctsr1);
+       value = spu_read_register_value(dev, &pmd_regs->ts_ctsr1);
 
        return sprintf(buf, "%d\n", reg_to_temp(value));
 }
@@ -147,48 +147,48 @@ static ssize_t store_throttle(struct cbe_pmd_regs __iomem *pmd_regs, const char
        return size;
 }
 
-static ssize_t spu_show_throttle_end(struct sys_device *sysdev,
-                       struct sysdev_attribute *attr, char *buf)
+static ssize_t spu_show_throttle_end(struct device *dev,
+                       struct device_attribute *attr, char *buf)
 {
-       return show_throttle(get_pmd_regs(sysdev), buf, 0);
+       return show_throttle(get_pmd_regs(dev), buf, 0);
 }
 
-static ssize_t spu_show_throttle_begin(struct sys_device *sysdev,
-                       struct sysdev_attribute *attr, char *buf)
+static ssize_t spu_show_throttle_begin(struct device *dev,
+                       struct device_attribute *attr, char *buf)
 {
-       return show_throttle(get_pmd_regs(sysdev), buf, 8);
+       return show_throttle(get_pmd_regs(dev), buf, 8);
 }
 
-static ssize_t spu_show_throttle_full_stop(struct sys_device *sysdev,
-                       struct sysdev_attribute *attr, char *buf)
+static ssize_t spu_show_throttle_full_stop(struct device *dev,
+                       struct device_attribute *attr, char *buf)
 {
-       return show_throttle(get_pmd_regs(sysdev), buf, 16);
+       return show_throttle(get_pmd_regs(dev), buf, 16);
 }
 
-static ssize_t spu_store_throttle_end(struct sys_device *sysdev,
-                       struct sysdev_attribute *attr, const char *buf, size_t size)
+static ssize_t spu_store_throttle_end(struct device *dev,
+                       struct device_attribute *attr, const char *buf, size_t size)
 {
-       return store_throttle(get_pmd_regs(sysdev), buf, size, 0);
+       return store_throttle(get_pmd_regs(dev), buf, size, 0);
 }
 
-static ssize_t spu_store_throttle_begin(struct sys_device *sysdev,
-                       struct sysdev_attribute *attr, const char *buf, size_t size)
+static ssize_t spu_store_throttle_begin(struct device *dev,
+                       struct device_attribute *attr, const char *buf, size_t size)
 {
-       return store_throttle(get_pmd_regs(sysdev), buf, size, 8);
+       return store_throttle(get_pmd_regs(dev), buf, size, 8);
 }
 
-static ssize_t spu_store_throttle_full_stop(struct sys_device *sysdev,
-                       struct sysdev_attribute *attr, const char *buf, size_t size)
+static ssize_t spu_store_throttle_full_stop(struct device *dev,
+                       struct device_attribute *attr, const char *buf, size_t size)
 {
-       return store_throttle(get_pmd_regs(sysdev), buf, size, 16);
+       return store_throttle(get_pmd_regs(dev), buf, size, 16);
 }
 
-static ssize_t ppe_show_temp(struct sys_device *sysdev, char *buf, int pos)
+static ssize_t ppe_show_temp(struct device *dev, char *buf, int pos)
 {
        struct cbe_pmd_regs __iomem *pmd_regs;
        u64 value;
 
-       pmd_regs = cbe_get_cpu_pmd_regs(sysdev->id);
+       pmd_regs = cbe_get_cpu_pmd_regs(dev->id);
        value = in_be64(&pmd_regs->ts_ctsr2);
 
        value = (value >> pos) & 0x3f;
@@ -199,64 +199,64 @@ static ssize_t ppe_show_temp(struct sys_device *sysdev, char *buf, int pos)
 
 /* shows the temperature of the DTS on the PPE,
  * located near the linear thermal sensor */
-static ssize_t ppe_show_temp0(struct sys_device *sysdev,
-                       struct sysdev_attribute *attr, char *buf)
+static ssize_t ppe_show_temp0(struct device *dev,
+                       struct device_attribute *attr, char *buf)
 {
-       return ppe_show_temp(sysdev, buf, 32);
+       return ppe_show_temp(dev, buf, 32);
 }
 
 /* shows the temperature of the second DTS on the PPE */
-static ssize_t ppe_show_temp1(struct sys_device *sysdev,
-                       struct sysdev_attribute *attr, char *buf)
+static ssize_t ppe_show_temp1(struct device *dev,
+                       struct device_attribute *attr, char *buf)
 {
-       return ppe_show_temp(sysdev, buf, 0);
+       return ppe_show_temp(dev, buf, 0);
 }
 
-static ssize_t ppe_show_throttle_end(struct sys_device *sysdev,
-                       struct sysdev_attribute *attr, char *buf)
+static ssize_t ppe_show_throttle_end(struct device *dev,
+                       struct device_attribute *attr, char *buf)
 {
-       return show_throttle(cbe_get_cpu_pmd_regs(sysdev->id), buf, 32);
+       return show_throttle(cbe_get_cpu_pmd_regs(dev->id), buf, 32);
 }
 
-static ssize_t ppe_show_throttle_begin(struct sys_device *sysdev,
-                       struct sysdev_attribute *attr, char *buf)
+static ssize_t ppe_show_throttle_begin(struct device *dev,
+                       struct device_attribute *attr, char *buf)
 {
-       return show_throttle(cbe_get_cpu_pmd_regs(sysdev->id), buf, 40);
+       return show_throttle(cbe_get_cpu_pmd_regs(dev->id), buf, 40);
 }
 
-static ssize_t ppe_show_throttle_full_stop(struct sys_device *sysdev,
-                       struct sysdev_attribute *attr, char *buf)
+static ssize_t ppe_show_throttle_full_stop(struct device *dev,
+                       struct device_attribute *attr, char *buf)
 {
-       return show_throttle(cbe_get_cpu_pmd_regs(sysdev->id), buf, 48);
+       return show_throttle(cbe_get_cpu_pmd_regs(dev->id), buf, 48);
 }
 
-static ssize_t ppe_store_throttle_end(struct sys_device *sysdev,
-                       struct sysdev_attribute *attr, const char *buf, size_t size)
+static ssize_t ppe_store_throttle_end(struct device *dev,
+                       struct device_attribute *attr, const char *buf, size_t size)
 {
-       return store_throttle(cbe_get_cpu_pmd_regs(sysdev->id), buf, size, 32);
+       return store_throttle(cbe_get_cpu_pmd_regs(dev->id), buf, size, 32);
 }
 
-static ssize_t ppe_store_throttle_begin(struct sys_device *sysdev,
-                       struct sysdev_attribute *attr, const char *buf, size_t size)
+static ssize_t ppe_store_throttle_begin(struct device *dev,
+                       struct device_attribute *attr, const char *buf, size_t size)
 {
-       return store_throttle(cbe_get_cpu_pmd_regs(sysdev->id), buf, size, 40);
+       return store_throttle(cbe_get_cpu_pmd_regs(dev->id), buf, size, 40);
 }
 
-static ssize_t ppe_store_throttle_full_stop(struct sys_device *sysdev,
-                       struct sysdev_attribute *attr, const char *buf, size_t size)
+static ssize_t ppe_store_throttle_full_stop(struct device *dev,
+                       struct device_attribute *attr, const char *buf, size_t size)
 {
-       return store_throttle(cbe_get_cpu_pmd_regs(sysdev->id), buf, size, 48);
+       return store_throttle(cbe_get_cpu_pmd_regs(dev->id), buf, size, 48);
 }
 
 
-static struct sysdev_attribute attr_spu_temperature = {
+static struct device_attribute attr_spu_temperature = {
        .attr = {.name = "temperature", .mode = 0400 },
        .show = spu_show_temp,
 };
 
-static SYSDEV_PREFIX_ATTR(spu, throttle_end, 0600);
-static SYSDEV_PREFIX_ATTR(spu, throttle_begin, 0600);
-static SYSDEV_PREFIX_ATTR(spu, throttle_full_stop, 0600);
+static DEVICE_PREFIX_ATTR(spu, throttle_end, 0600);
+static DEVICE_PREFIX_ATTR(spu, throttle_begin, 0600);
+static DEVICE_PREFIX_ATTR(spu, throttle_full_stop, 0600);
 
 
 static struct attribute *spu_attributes[] = {
@@ -272,19 +272,19 @@ static struct attribute_group spu_attribute_group = {
        .attrs  = spu_attributes,
 };
 
-static struct sysdev_attribute attr_ppe_temperature0 = {
+static struct device_attribute attr_ppe_temperature0 = {
        .attr = {.name = "temperature0", .mode = 0400 },
        .show = ppe_show_temp0,
 };
 
-static struct sysdev_attribute attr_ppe_temperature1 = {
+static struct device_attribute attr_ppe_temperature1 = {
        .attr = {.name = "temperature1", .mode = 0400 },
        .show = ppe_show_temp1,
 };
 
-static SYSDEV_PREFIX_ATTR(ppe, throttle_end, 0600);
-static SYSDEV_PREFIX_ATTR(ppe, throttle_begin, 0600);
-static SYSDEV_PREFIX_ATTR(ppe, throttle_full_stop, 0600);
+static DEVICE_PREFIX_ATTR(ppe, throttle_end, 0600);
+static DEVICE_PREFIX_ATTR(ppe, throttle_begin, 0600);
+static DEVICE_PREFIX_ATTR(ppe, throttle_full_stop, 0600);
 
 static struct attribute *ppe_attributes[] = {
        &attr_ppe_temperature0.attr,
@@ -307,7 +307,7 @@ static int __init init_default_values(void)
 {
        int cpu;
        struct cbe_pmd_regs __iomem *pmd_regs;
-       struct sys_device *sysdev;
+       struct device *dev;
        union ppe_spe_reg tpr;
        union spe_reg str1;
        u64 str2;
@@ -349,14 +349,14 @@ static int __init init_default_values(void)
 
        for_each_possible_cpu (cpu) {
                pr_debug("processing cpu %d\n", cpu);
-               sysdev = get_cpu_sysdev(cpu);
+               dev = get_cpu_device(cpu);
 
-               if (!sysdev) {
-                       pr_info("invalid sysdev pointer for cbe_thermal\n");
+               if (!dev) {
+                       pr_info("invalid dev pointer for cbe_thermal\n");
                        return -EINVAL;
                }
 
-               pmd_regs = cbe_get_cpu_pmd_regs(sysdev->id);
+               pmd_regs = cbe_get_cpu_pmd_regs(dev->id);
 
                if (!pmd_regs) {
                        pr_info("invalid CBE regs pointer for cbe_thermal\n");
@@ -379,8 +379,8 @@ static int __init thermal_init(void)
        int rc = init_default_values();
 
        if (rc == 0) {
-               spu_add_sysdev_attr_group(&spu_attribute_group);
-               cpu_add_sysdev_attr_group(&ppe_attribute_group);
+               spu_add_dev_attr_group(&spu_attribute_group);
+               cpu_add_dev_attr_group(&ppe_attribute_group);
        }
 
        return rc;
@@ -389,8 +389,8 @@ module_init(thermal_init);
 
 static void __exit thermal_exit(void)
 {
-       spu_remove_sysdev_attr_group(&spu_attribute_group);
-       cpu_remove_sysdev_attr_group(&ppe_attribute_group);
+       spu_remove_dev_attr_group(&spu_attribute_group);
+       cpu_remove_dev_attr_group(&ppe_attribute_group);
 }
 module_exit(thermal_exit);