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

This moves the 'cpu sysdev_class' over to a regular 'cpu' subsystem
and converts the devices to regular devices. The sysdev drivers are
implemented as subsystem interfaces now.

After all sysdev classes are ported to regular driver core entities, the
sysdev implementation will be entirely removed from the kernel.

Userspace relies on events and generic sysfs subsystem infrastructure
from sysdev devices, which are made available with this conversion.

Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Chris Metcalf <cmetcalf@tilera.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Borislav Petkov <bp@amd64.org>
Cc: Tigran Aivazian <tigran@aivazian.fsnet.co.uk>
Cc: Len Brown <lenb@kernel.org>
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Dave Jones <davej@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: "Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 61 insertions, 61 deletions

diff --git a/arch/sparc/kernel/sysfs.c b/arch/sparc/kernel/sysfs.c
index 7408201d7efb..654e8aad3bbe 100644
--- a/arch/sparc/kernel/sysfs.c
+++ b/arch/sparc/kernel/sysfs.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2007 David S. Miller <davem@davemloft.net>
  */
 #include <linux/sched.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/cpu.h>
 #include <linux/smp.h>
 #include <linux/percpu.h>
@@ -16,13 +16,13 @@
 static DEFINE_PER_CPU(struct hv_mmu_statistics, mmu_stats) __attribute__((aligned(64)));
 
 #define SHOW_MMUSTAT_ULONG(NAME) \
-static ssize_t show_##NAME(struct sys_device *dev, \
-                        struct sysdev_attribute *attr, char *buf) \
+static ssize_t show_##NAME(struct device *dev, \
+                        struct device_attribute *attr, char *buf) \
 { \
         struct hv_mmu_statistics *p = &per_cpu(mmu_stats, dev->id); \
         return sprintf(buf, "%lu\n", p->NAME); \
 } \
-static SYSDEV_ATTR(NAME, 0444, show_##NAME, NULL)
+static DEVICE_ATTR(NAME, 0444, show_##NAME, NULL)
 
 SHOW_MMUSTAT_ULONG(immu_tsb_hits_ctx0_8k_tte);
 SHOW_MMUSTAT_ULONG(immu_tsb_ticks_ctx0_8k_tte);
@@ -58,38 +58,38 @@ SHOW_MMUSTAT_ULONG(dmmu_tsb_hits_ctxnon0_256mb_tte);
 SHOW_MMUSTAT_ULONG(dmmu_tsb_ticks_ctxnon0_256mb_tte);
 
 static struct attribute *mmu_stat_attrs[] = {
-        &attr_immu_tsb_hits_ctx0_8k_tte.attr,
-        &attr_immu_tsb_ticks_ctx0_8k_tte.attr,
-        &attr_immu_tsb_hits_ctx0_64k_tte.attr,
-        &attr_immu_tsb_ticks_ctx0_64k_tte.attr,
-        &attr_immu_tsb_hits_ctx0_4mb_tte.attr,
-        &attr_immu_tsb_ticks_ctx0_4mb_tte.attr,
-        &attr_immu_tsb_hits_ctx0_256mb_tte.attr,
-        &attr_immu_tsb_ticks_ctx0_256mb_tte.attr,
-        &attr_immu_tsb_hits_ctxnon0_8k_tte.attr,
-        &attr_immu_tsb_ticks_ctxnon0_8k_tte.attr,
-        &attr_immu_tsb_hits_ctxnon0_64k_tte.attr,
-        &attr_immu_tsb_ticks_ctxnon0_64k_tte.attr,
-        &attr_immu_tsb_hits_ctxnon0_4mb_tte.attr,
-        &attr_immu_tsb_ticks_ctxnon0_4mb_tte.attr,
-        &attr_immu_tsb_hits_ctxnon0_256mb_tte.attr,
-        &attr_immu_tsb_ticks_ctxnon0_256mb_tte.attr,
-        &attr_dmmu_tsb_hits_ctx0_8k_tte.attr,
-        &attr_dmmu_tsb_ticks_ctx0_8k_tte.attr,
-        &attr_dmmu_tsb_hits_ctx0_64k_tte.attr,
-        &attr_dmmu_tsb_ticks_ctx0_64k_tte.attr,
-        &attr_dmmu_tsb_hits_ctx0_4mb_tte.attr,
-        &attr_dmmu_tsb_ticks_ctx0_4mb_tte.attr,
-        &attr_dmmu_tsb_hits_ctx0_256mb_tte.attr,
-        &attr_dmmu_tsb_ticks_ctx0_256mb_tte.attr,
-        &attr_dmmu_tsb_hits_ctxnon0_8k_tte.attr,
-        &attr_dmmu_tsb_ticks_ctxnon0_8k_tte.attr,
-        &attr_dmmu_tsb_hits_ctxnon0_64k_tte.attr,
-        &attr_dmmu_tsb_ticks_ctxnon0_64k_tte.attr,
-        &attr_dmmu_tsb_hits_ctxnon0_4mb_tte.attr,
-        &attr_dmmu_tsb_ticks_ctxnon0_4mb_tte.attr,
-        &attr_dmmu_tsb_hits_ctxnon0_256mb_tte.attr,
-        &attr_dmmu_tsb_ticks_ctxnon0_256mb_tte.attr,
+        &dev_attr_immu_tsb_hits_ctx0_8k_tte.attr,
+        &dev_attr_immu_tsb_ticks_ctx0_8k_tte.attr,
+        &dev_attr_immu_tsb_hits_ctx0_64k_tte.attr,
+        &dev_attr_immu_tsb_ticks_ctx0_64k_tte.attr,
+        &dev_attr_immu_tsb_hits_ctx0_4mb_tte.attr,
+        &dev_attr_immu_tsb_ticks_ctx0_4mb_tte.attr,
+        &dev_attr_immu_tsb_hits_ctx0_256mb_tte.attr,
+        &dev_attr_immu_tsb_ticks_ctx0_256mb_tte.attr,
+        &dev_attr_immu_tsb_hits_ctxnon0_8k_tte.attr,
+        &dev_attr_immu_tsb_ticks_ctxnon0_8k_tte.attr,
+        &dev_attr_immu_tsb_hits_ctxnon0_64k_tte.attr,
+        &dev_attr_immu_tsb_ticks_ctxnon0_64k_tte.attr,
+        &dev_attr_immu_tsb_hits_ctxnon0_4mb_tte.attr,
+        &dev_attr_immu_tsb_ticks_ctxnon0_4mb_tte.attr,
+        &dev_attr_immu_tsb_hits_ctxnon0_256mb_tte.attr,
+        &dev_attr_immu_tsb_ticks_ctxnon0_256mb_tte.attr,
+        &dev_attr_dmmu_tsb_hits_ctx0_8k_tte.attr,
+        &dev_attr_dmmu_tsb_ticks_ctx0_8k_tte.attr,
+        &dev_attr_dmmu_tsb_hits_ctx0_64k_tte.attr,
+        &dev_attr_dmmu_tsb_ticks_ctx0_64k_tte.attr,
+        &dev_attr_dmmu_tsb_hits_ctx0_4mb_tte.attr,
+        &dev_attr_dmmu_tsb_ticks_ctx0_4mb_tte.attr,
+        &dev_attr_dmmu_tsb_hits_ctx0_256mb_tte.attr,
+        &dev_attr_dmmu_tsb_ticks_ctx0_256mb_tte.attr,
+        &dev_attr_dmmu_tsb_hits_ctxnon0_8k_tte.attr,
+        &dev_attr_dmmu_tsb_ticks_ctxnon0_8k_tte.attr,
+        &dev_attr_dmmu_tsb_hits_ctxnon0_64k_tte.attr,
+        &dev_attr_dmmu_tsb_ticks_ctxnon0_64k_tte.attr,
+        &dev_attr_dmmu_tsb_hits_ctxnon0_4mb_tte.attr,
+        &dev_attr_dmmu_tsb_ticks_ctxnon0_4mb_tte.attr,
+        &dev_attr_dmmu_tsb_hits_ctxnon0_256mb_tte.attr,
+        &dev_attr_dmmu_tsb_ticks_ctxnon0_256mb_tte.attr,
         NULL,
 };
 
@@ -139,15 +139,15 @@ static unsigned long write_mmustat_enable(unsigned long val)
         return sun4v_mmustat_conf(ra, &orig_ra);
 }
 
-static ssize_t show_mmustat_enable(struct sys_device *s,
-                                struct sysdev_attribute *attr, char *buf)
+static ssize_t show_mmustat_enable(struct device *s,
+                                struct device_attribute *attr, char *buf)
 {
         unsigned long val = run_on_cpu(s->id, read_mmustat_enable, 0);
         return sprintf(buf, "%lx\n", val);
 }
 
-static ssize_t store_mmustat_enable(struct sys_device *s,
-                        struct sysdev_attribute *attr, const char *buf,
+static ssize_t store_mmustat_enable(struct device *s,
+                        struct device_attribute *attr, const char *buf,
                         size_t count)
 {
         unsigned long val, err;
@@ -163,39 +163,39 @@ static ssize_t store_mmustat_enable(struct sys_device *s,
         return count;
 }
 
-static SYSDEV_ATTR(mmustat_enable, 0644, show_mmustat_enable, store_mmustat_enable);
+static DEVICE_ATTR(mmustat_enable, 0644, show_mmustat_enable, store_mmustat_enable);
 
 static int mmu_stats_supported;
 
-static int register_mmu_stats(struct sys_device *s)
+static int register_mmu_stats(struct device *s)
 {
         if (!mmu_stats_supported)
                 return 0;
-        sysdev_create_file(s, &attr_mmustat_enable);
+        device_create_file(s, &dev_attr_mmustat_enable);
         return sysfs_create_group(&s->kobj, &mmu_stat_group);
 }
 
 #ifdef CONFIG_HOTPLUG_CPU
-static void unregister_mmu_stats(struct sys_device *s)
+static void unregister_mmu_stats(struct device *s)
 {
         if (!mmu_stats_supported)
                 return;
         sysfs_remove_group(&s->kobj, &mmu_stat_group);
-        sysdev_remove_file(s, &attr_mmustat_enable);
+        device_remove_file(s, &dev_attr_mmustat_enable);
 }
 #endif
 
 #define SHOW_CPUDATA_ULONG_NAME(NAME, MEMBER) \
-static ssize_t show_##NAME(struct sys_device *dev, \
-                struct sysdev_attribute *attr, char *buf) \
+static ssize_t show_##NAME(struct device *dev, \
+                struct device_attribute *attr, char *buf) \
 { \
         cpuinfo_sparc *c = &cpu_data(dev->id); \
         return sprintf(buf, "%lu\n", c->MEMBER); \
 }
 
 #define SHOW_CPUDATA_UINT_NAME(NAME, MEMBER) \
-static ssize_t show_##NAME(struct sys_device *dev, \
-                struct sysdev_attribute *attr, char *buf) \
+static ssize_t show_##NAME(struct device *dev, \
+                struct device_attribute *attr, char *buf) \
 { \
         cpuinfo_sparc *c = &cpu_data(dev->id); \
         return sprintf(buf, "%u\n", c->MEMBER); \
@@ -209,14 +209,14 @@ SHOW_CPUDATA_UINT_NAME(l1_icache_line_size, icache_line_size);
 SHOW_CPUDATA_UINT_NAME(l2_cache_size, ecache_size);
 SHOW_CPUDATA_UINT_NAME(l2_cache_line_size, ecache_line_size);
 
-static struct sysdev_attribute cpu_core_attrs[] = {
-        _SYSDEV_ATTR(clock_tick,          0444, show_clock_tick, NULL),
-        _SYSDEV_ATTR(l1_dcache_size,      0444, show_l1_dcache_size, NULL),
-        _SYSDEV_ATTR(l1_dcache_line_size, 0444, show_l1_dcache_line_size, NULL),
-        _SYSDEV_ATTR(l1_icache_size,      0444, show_l1_icache_size, NULL),
-        _SYSDEV_ATTR(l1_icache_line_size, 0444, show_l1_icache_line_size, NULL),
-        _SYSDEV_ATTR(l2_cache_size,       0444, show_l2_cache_size, NULL),
-        _SYSDEV_ATTR(l2_cache_line_size,  0444, show_l2_cache_line_size, NULL),
+static struct device_attribute cpu_core_attrs[] = {
+        __ATTR(clock_tick,          0444, show_clock_tick, NULL),
+        __ATTR(l1_dcache_size,      0444, show_l1_dcache_size, NULL),
+        __ATTR(l1_dcache_line_size, 0444, show_l1_dcache_line_size, NULL),
+        __ATTR(l1_icache_size,      0444, show_l1_icache_size, NULL),
+        __ATTR(l1_icache_line_size, 0444, show_l1_icache_line_size, NULL),
+        __ATTR(l2_cache_size,       0444, show_l2_cache_size, NULL),
+        __ATTR(l2_cache_line_size,  0444, show_l2_cache_line_size, NULL),
 };
 
 static DEFINE_PER_CPU(struct cpu, cpu_devices);
@@ -224,11 +224,11 @@ static DEFINE_PER_CPU(struct cpu, cpu_devices);
 static void register_cpu_online(unsigned int cpu)
 {
         struct cpu *c = &per_cpu(cpu_devices, cpu);
-        struct sys_device *s = &c->sysdev;
+        struct device *s = &c->dev;
         int i;
 
         for (i = 0; i < ARRAY_SIZE(cpu_core_attrs); i++)
-                sysdev_create_file(s, &cpu_core_attrs[i]);
+                device_create_file(s, &cpu_core_attrs[i]);
 
         register_mmu_stats(s);
 }
@@ -237,12 +237,12 @@ static void register_cpu_online(unsigned int cpu)
 static void unregister_cpu_online(unsigned int cpu)
 {
         struct cpu *c = &per_cpu(cpu_devices, cpu);
-        struct sys_device *s = &c->sysdev;
+        struct device *s = &c->dev;
         int i;
 
         unregister_mmu_stats(s);
         for (i = 0; i < ARRAY_SIZE(cpu_core_attrs); i++)
-                sysdev_remove_file(s, &cpu_core_attrs[i]);
+                device_remove_file(s, &cpu_core_attrs[i]);
 }
 #endif