[PATCH 16/36] Driver core: convert msr code to use struct device

From: Greg Kroah-Hartman <[email protected]>

Converts from using struct "class_device" to "struct device" making
everything show up properly in /sys/devices/ with symlinks from the
/sys/class directory.

Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
 arch/i386/kernel/msr.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/arch/i386/kernel/msr.c b/arch/i386/kernel/msr.c
index d535cdb..a773f77 100644
--- a/arch/i386/kernel/msr.c
+++ b/arch/i386/kernel/msr.c
@@ -239,14 +239,14 @@ static struct file_operations msr_fops =
 	.open = msr_open,
 };
 
-static int msr_class_device_create(int i)
+static int msr_device_create(int i)
 {
 	int err = 0;
-	struct class_device *class_err;
+	struct device *dev;
 
-	class_err = class_device_create(msr_class, NULL, MKDEV(MSR_MAJOR, i), NULL, "msr%d",i);
-	if (IS_ERR(class_err)) 
-		err = PTR_ERR(class_err);
+	dev = device_create(msr_class, NULL, MKDEV(MSR_MAJOR, i), "msr%d",i);
+	if (IS_ERR(dev))
+		err = PTR_ERR(dev);
 	return err;
 }
 
@@ -258,10 +258,10 @@ static int msr_class_cpu_callback(struct
 
 	switch (action) {
 	case CPU_ONLINE:
-		msr_class_device_create(cpu);
+		msr_device_create(cpu);
 		break;
 	case CPU_DEAD:
-		class_device_destroy(msr_class, MKDEV(MSR_MAJOR, cpu));
+		device_destroy(msr_class, MKDEV(MSR_MAJOR, cpu));
 		break;
 	}
 	return NOTIFY_OK;
@@ -290,7 +290,7 @@ static int __init msr_init(void)
 		goto out_chrdev;
 	}
 	for_each_online_cpu(i) {
-		err = msr_class_device_create(i);
+		err = msr_device_create(i);
 		if (err != 0)
 			goto out_class;
 	}
@@ -302,7 +302,7 @@ static int __init msr_init(void)
 out_class:
 	i = 0;
 	for_each_online_cpu(i)
-		class_device_destroy(msr_class, MKDEV(MSR_MAJOR, i));
+		device_destroy(msr_class, MKDEV(MSR_MAJOR, i));
 	class_destroy(msr_class);
 out_chrdev:
 	unregister_chrdev(MSR_MAJOR, "cpu/msr");
@@ -314,7 +314,7 @@ static void __exit msr_exit(void)
 {
 	int cpu = 0;
 	for_each_online_cpu(cpu)
-		class_device_destroy(msr_class, MKDEV(MSR_MAJOR, cpu));
+		device_destroy(msr_class, MKDEV(MSR_MAJOR, cpu));
 	class_destroy(msr_class);
 	unregister_chrdev(MSR_MAJOR, "cpu/msr");
 	unregister_hotcpu_notifier(&msr_class_cpu_notifier);
-- 
1.4.4.1

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

---

• Follow-Ups:
  • [PATCH 17/36] Driver core: convert cpuid code to use struct device
    • From: Greg KH <[email protected]>

• References:
  • [GIT PATCH] Driver core patches for 2.6.19
    • From: Greg KH <[email protected]>
  • [PATCH 1/36] Driver core: add notification of bus events
    • From: Greg KH <[email protected]>
  • [PATCH 2/36] Driver core: fix "driver" symlink timing
    • From: Greg KH <[email protected]>
  • [PATCH 3/36] Driver Core: Move virtual_device_parent() to core.c
    • From: Greg KH <[email protected]>
  • [PATCH 4/36] CONFIG_SYSFS_DEPRECATED
    • From: Greg KH <[email protected]>
  • [PATCH 5/36] Driver core: make old versions of udev work properly
    • From: Greg KH <[email protected]>
  • [PATCH 6/36] CONFIG_SYSFS_DEPRECATED - bus symlinks
    • From: Greg KH <[email protected]>
  • [PATCH 7/36] CONFIG_SYSFS_DEPRECATED - device symlinks
    • From: Greg KH <[email protected]>
  • [PATCH 8/36] CONFIG_SYSFS_DEPRECATED - PHYSDEV* uevent variables
    • From: Greg KH <[email protected]>
  • [PATCH 9/36] CONFIG_SYSFS_DEPRECATED - class symlinks
    • From: Greg KH <[email protected]>
  • [PATCH 10/36] Driver core: convert vt code to use struct device
    • From: Greg KH <[email protected]>
  • [PATCH 11/36] Driver core: convert vc code to use struct device
    • From: Greg KH <[email protected]>
  • [PATCH 12/36] Driver core: change misc class_devices to be real devices
    • From: Greg KH <[email protected]>
  • [PATCH 13/36] Driver core: convert tty core to use struct device
    • From: Greg KH <[email protected]>
  • [PATCH 14/36] Driver core: convert raw device code to use struct device
    • From: Greg KH <[email protected]>
  • [PATCH 15/36] I2C: convert i2c-dev to use struct device instead of struct class_device
    • From: Greg KH <[email protected]>

• Prev by Date: [PATCH 29/36] sysfs: sysfs_write_file() writes zero terminated data
• Next by Date: [PATCH 17/36] Driver core: convert cpuid code to use struct device
• Previous by thread: [PATCH 15/36] I2C: convert i2c-dev to use struct device instead of struct class_device
• Next by thread: [PATCH 17/36] Driver core: convert cpuid code to use struct device
• Index(es):
  • Date
  • Thread

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]