Merge to Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.13-vs2...

[linux-2.6.git] / drivers / base / class_simple.c

diff --git a/drivers/base/class_simple.c b/drivers/base/class_simple.c
index 20707be..27699eb 100644 (file)
--- a/drivers/base/class_simple.c
+++ b/drivers/base/class_simple.c
@@ -3,31 +3,28 @@
  *
  * Copyright (c) 2003-2004 Greg Kroah-Hartman <greg@kroah.com>
  * Copyright (c) 2003-2004 IBM Corp.
- * 
+ *
  * This file is released under the GPLv2
  *
  */
 
 #include <linux/config.h>
 #include <linux/device.h>
-#include <linux/kdev_t.h>
 #include <linux/err.h>
 
 struct class_simple {
-       struct class_device_attribute attr;
        struct class class;
 };
 #define to_class_simple(d) container_of(d, struct class_simple, class)
 
 struct simple_dev {
        struct list_head node;
-       dev_t dev;
        struct class_device class_dev;
 };
 #define to_simple_dev(d) container_of(d, struct simple_dev, class_dev)
 
 static LIST_HEAD(simple_dev_list);
-static spinlock_t simple_dev_list_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(simple_dev_list_lock);
 
 static void release_simple_dev(struct class_device *class_dev)
 {
@@ -35,12 +32,6 @@ static void release_simple_dev(struct class_device *class_dev)
        kfree(s_dev);
 }
 
-static ssize_t show_dev(struct class_device *class_dev, char *buf)
-{
-       struct simple_dev *s_dev = to_simple_dev(class_dev);
-       return print_dev_t(buf, s_dev->dev);
-}
-
 static void class_simple_release(struct class *class)
 {
        struct class_simple *cs = to_class_simple(class);
@@ -75,12 +66,6 @@ struct class_simple *class_simple_create(struct module *owner, char *name)
        cs->class.class_release = class_simple_release;
        cs->class.release = release_simple_dev;
 
-       cs->attr.attr.name = "dev";
-       cs->attr.attr.mode = S_IRUGO;
-       cs->attr.attr.owner = owner;
-       cs->attr.show = show_dev;
-       cs->attr.store = NULL;
-
        retval = class_register(&cs->class);
        if (retval)
                goto error;
@@ -111,7 +96,7 @@ EXPORT_SYMBOL(class_simple_destroy);
 
 /**
  * class_simple_device_add - adds a class device to sysfs for a character driver
- * @cs: pointer to the struct class_simple that this device should be registered to.  
+ * @cs: pointer to the struct class_simple that this device should be registered to.
  * @dev: the dev_t for the device to be added.
  * @device: a pointer to a struct device that is assiociated with this class device.
  * @fmt: string for the class device's name
@@ -122,7 +107,7 @@ EXPORT_SYMBOL(class_simple_destroy);
  * be created, showing the dev_t for the device.  The pointer to the struct
  * class_device will be returned from the call.  Any further sysfs files that
  * might be required can be created using this pointer.
- * Note: the struct class_device passed to this function must have previously been
+ * Note: the struct class_simple passed to this function must have previously been
  * created with a call to class_simple_create().
  */
 struct class_device *class_simple_device_add(struct class_simple *cs, dev_t dev, struct device *device, const char *fmt, ...)
@@ -143,19 +128,17 @@ struct class_device *class_simple_device_add(struct class_simple *cs, dev_t dev,
        }
        memset(s_dev, 0x00, sizeof(*s_dev));
 
-       s_dev->dev = dev;
+       s_dev->class_dev.devt = dev;
        s_dev->class_dev.dev = device;
        s_dev->class_dev.class = &cs->class;
-       
-       va_start(args,fmt);
+
+       va_start(args, fmt);
        vsnprintf(s_dev->class_dev.class_id, BUS_ID_SIZE, fmt, args);
        va_end(args);
        retval = class_device_register(&s_dev->class_dev);
        if (retval)
                goto error;
 
-       class_device_create_file(&s_dev->class_dev, &cs->attr);
-
        spin_lock(&simple_dev_list_lock);
        list_add(&s_dev->node, &simple_dev_list);
        spin_unlock(&simple_dev_list_lock);
@@ -173,10 +156,10 @@ EXPORT_SYMBOL(class_simple_device_add);
  * @cs: pointer to the struct class_simple to hold the pointer
  * @hotplug: function pointer to the hotplug function
  *
- * Implement and set a hotplug function to add environment variables specific to this 
+ * Implement and set a hotplug function to add environment variables specific to this
  * class on the hotplug event.
  */
-int class_simple_set_hotplug(struct class_simple *cs, 
+int class_simple_set_hotplug(struct class_simple *cs,
        int (*hotplug)(struct class_device *dev, char **envp, int num_envp, char *buffer, int buffer_size))
 {
        if ((cs == NULL) || (IS_ERR(cs)))
@@ -200,7 +183,7 @@ void class_simple_device_remove(dev_t dev)
 
        spin_lock(&simple_dev_list_lock);
        list_for_each_entry(s_dev, &simple_dev_list, node) {
-               if (s_dev->dev == dev) {
+               if (s_dev->class_dev.devt == dev) {
                        found = 1;
                        break;
                }