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, 37 insertions, 37 deletions

diff --git a/arch/avr32/kernel/cpu.c b/arch/avr32/kernel/cpu.c
index e84faffbbeca..2233be71e2e8 100644
--- a/arch/avr32/kernel/cpu.c
+++ b/arch/avr32/kernel/cpu.c
@@ -6,7 +6,7 @@
  * published by the Free Software Foundation.
  */
 #include <linux/init.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/seq_file.h>
 #include <linux/cpu.h>
 #include <linux/module.h>
@@ -26,16 +26,16 @@ static DEFINE_PER_CPU(struct cpu, cpu_devices);
  * XXX: If/when a SMP-capable implementation of AVR32 will ever be
  * made, we must make sure that the code executes on the correct CPU.
  */
-static ssize_t show_pc0event(struct sys_device *dev,
-                        struct sysdev_attribute *attr, char *buf)
+static ssize_t show_pc0event(struct device *dev,
+                        struct device_attribute *attr, char *buf)
 {
         unsigned long pccr;
 
         pccr = sysreg_read(PCCR);
         return sprintf(buf, "0x%lx\n", (pccr >> 12) & 0x3f);
 }
-static ssize_t store_pc0event(struct sys_device *dev,
-                        struct sysdev_attribute *attr, const char *buf,
+static ssize_t store_pc0event(struct device *dev,
+                        struct device_attribute *attr, const char *buf,
                               size_t count)
 {
         unsigned long val;
@@ -48,16 +48,16 @@ static ssize_t store_pc0event(struct sys_device *dev,
         sysreg_write(PCCR, val);
         return count;
 }
-static ssize_t show_pc0count(struct sys_device *dev,
-                        struct sysdev_attribute *attr, char *buf)
+static ssize_t show_pc0count(struct device *dev,
+                        struct device_attribute *attr, char *buf)
 {
         unsigned long pcnt0;
 
         pcnt0 = sysreg_read(PCNT0);
         return sprintf(buf, "%lu\n", pcnt0);
 }
-static ssize_t store_pc0count(struct sys_device *dev,
-                                struct sysdev_attribute *attr,
+static ssize_t store_pc0count(struct device *dev,
+                                struct device_attribute *attr,
                                 const char *buf, size_t count)
 {
         unsigned long val;
@@ -71,16 +71,16 @@ static ssize_t store_pc0count(struct sys_device *dev,
         return count;
 }
 
-static ssize_t show_pc1event(struct sys_device *dev,
-                                struct sysdev_attribute *attr, char *buf)
+static ssize_t show_pc1event(struct device *dev,
+                                struct device_attribute *attr, char *buf)
 {
         unsigned long pccr;
 
         pccr = sysreg_read(PCCR);
         return sprintf(buf, "0x%lx\n", (pccr >> 18) & 0x3f);
 }
-static ssize_t store_pc1event(struct sys_device *dev,
-                              struct sysdev_attribute *attr, const char *buf,
+static ssize_t store_pc1event(struct device *dev,
+                              struct device_attribute *attr, const char *buf,
                               size_t count)
 {
         unsigned long val;
@@ -93,16 +93,16 @@ static ssize_t store_pc1event(struct sys_device *dev,
         sysreg_write(PCCR, val);
         return count;
 }
-static ssize_t show_pc1count(struct sys_device *dev,
-                                struct sysdev_attribute *attr, char *buf)
+static ssize_t show_pc1count(struct device *dev,
+                                struct device_attribute *attr, char *buf)
 {
         unsigned long pcnt1;
 
         pcnt1 = sysreg_read(PCNT1);
         return sprintf(buf, "%lu\n", pcnt1);
 }
-static ssize_t store_pc1count(struct sys_device *dev,
-                                struct sysdev_attribute *attr, const char *buf,
+static ssize_t store_pc1count(struct device *dev,
+                                struct device_attribute *attr, const char *buf,
                               size_t count)
 {
         unsigned long val;
@@ -116,16 +116,16 @@ static ssize_t store_pc1count(struct sys_device *dev,
         return count;
 }
 
-static ssize_t show_pccycles(struct sys_device *dev,
-                                struct sysdev_attribute *attr, char *buf)
+static ssize_t show_pccycles(struct device *dev,
+                                struct device_attribute *attr, char *buf)
 {
         unsigned long pccnt;
 
         pccnt = sysreg_read(PCCNT);
         return sprintf(buf, "%lu\n", pccnt);
 }
-static ssize_t store_pccycles(struct sys_device *dev,
-                                struct sysdev_attribute *attr, const char *buf,
+static ssize_t store_pccycles(struct device *dev,
+                                struct device_attribute *attr, const char *buf,
                               size_t count)
 {
         unsigned long val;
@@ -139,16 +139,16 @@ static ssize_t store_pccycles(struct sys_device *dev,
         return count;
 }
 
-static ssize_t show_pcenable(struct sys_device *dev,
-                        struct sysdev_attribute *attr, char *buf)
+static ssize_t show_pcenable(struct device *dev,
+                        struct device_attribute *attr, char *buf)
 {
         unsigned long pccr;
 
         pccr = sysreg_read(PCCR);
         return sprintf(buf, "%c\n", (pccr & 1)?'1':'0');
 }
-static ssize_t store_pcenable(struct sys_device *dev,
-                              struct sysdev_attribute *attr, const char *buf,
+static ssize_t store_pcenable(struct device *dev,
+                              struct device_attribute *attr, const char *buf,
                               size_t count)
 {
         unsigned long pccr, val;
@@ -167,12 +167,12 @@ static ssize_t store_pcenable(struct sys_device *dev,
         return count;
 }
 
-static SYSDEV_ATTR(pc0event, 0600, show_pc0event, store_pc0event);
-static SYSDEV_ATTR(pc0count, 0600, show_pc0count, store_pc0count);
-static SYSDEV_ATTR(pc1event, 0600, show_pc1event, store_pc1event);
-static SYSDEV_ATTR(pc1count, 0600, show_pc1count, store_pc1count);
-static SYSDEV_ATTR(pccycles, 0600, show_pccycles, store_pccycles);
-static SYSDEV_ATTR(pcenable, 0600, show_pcenable, store_pcenable);
+static DEVICE_ATTR(pc0event, 0600, show_pc0event, store_pc0event);
+static DEVICE_ATTR(pc0count, 0600, show_pc0count, store_pc0count);
+static DEVICE_ATTR(pc1event, 0600, show_pc1event, store_pc1event);
+static DEVICE_ATTR(pc1count, 0600, show_pc1count, store_pc1count);
+static DEVICE_ATTR(pccycles, 0600, show_pccycles, store_pccycles);
+static DEVICE_ATTR(pcenable, 0600, show_pcenable, store_pcenable);
 
 #endif /* CONFIG_PERFORMANCE_COUNTERS */
 
@@ -186,12 +186,12 @@ static int __init topology_init(void)
                 register_cpu(c, cpu);
 
 #ifdef CONFIG_PERFORMANCE_COUNTERS
-                sysdev_create_file(&c->sysdev, &attr_pc0event);
-                sysdev_create_file(&c->sysdev, &attr_pc0count);
-                sysdev_create_file(&c->sysdev, &attr_pc1event);
-                sysdev_create_file(&c->sysdev, &attr_pc1count);
-                sysdev_create_file(&c->sysdev, &attr_pccycles);
-                sysdev_create_file(&c->sysdev, &attr_pcenable);
+                device_create_file(&c->dev, &dev_attr_pc0event);
+                device_create_file(&c->dev, &dev_attr_pc0count);
+                device_create_file(&c->dev, &dev_attr_pc1event);
+                device_create_file(&c->dev, &dev_attr_pc1count);
+                device_create_file(&c->dev, &dev_attr_pccycles);
+                device_create_file(&c->dev, &dev_attr_pcenable);
 #endif
         }