class: rename "sem" to "class_sem" in internal class structure

This renames the struct class "sem" field to be "class_sem" to make
things easier when struct bus_type and struct class merge in the future.
It also makes grepping for fields easier as well.

Based on an idea from Kay.

Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/base/base.h b/drivers/base/base.h
index a77d4bd2ea63cc437959bbf2df864412084ce5da..4435732437a598750a09f5e5c5d7b2688b5c6541 100644 (file)
--- a/drivers/base/base.h
+++ b/drivers/base/base.h
@@ -45,7 +45,7 @@ struct driver_private {
  * @class_devices - list of devices associated with this class
  * @class_interfaces - list of class_interfaces associated with this class
  * @class_dirs -
- * @sem - semaphore to protect the children, devices, and interfaces lists.
+ * @class_sem - semaphore to protect the children, devices, and interfaces lists.
  * @class - pointer back to the struct class that this structure is associated
  * with.
  *
@@ -58,7 +58,7 @@ struct class_private {
        struct list_head class_devices;
        struct list_head class_interfaces;
        struct kset class_dirs;
-       struct semaphore sem;
+       struct semaphore class_sem;
        struct class *class;
 };
 #define to_class(obj)  \

diff --git a/drivers/base/class.c b/drivers/base/class.c
index 86778b86496ecbabbe070d44dbd5465ca338e482..d24d21114ccbb175ee0c6d029897bb700f8018a8 100644 (file)
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -147,7 +147,7 @@ int class_register(struct class *cls)
        INIT_LIST_HEAD(&cp->class_devices);
        INIT_LIST_HEAD(&cp->class_interfaces);
        kset_init(&cp->class_dirs);
-       init_MUTEX(&cp->sem);
+       init_MUTEX(&cp->class_sem);
        error = kobject_set_name(&cp->class_subsys.kobj, "%s", cls->name);
        if (error) {
                kfree(cp);
@@ -278,7 +278,7 @@ char *make_class_name(const char *name, struct kobject *kobj)
  * We check the return of @fn each time. If it returns anything
  * other than 0, we break out and return that value.
  *
- * Note, we hold class->sem in this function, so it can not be
+ * Note, we hold class->class_sem in this function, so it can not be
  * re-acquired in @fn, otherwise it will self-deadlocking. For
  * example, calls to add or remove class members would be verboten.
  */
@@ -290,7 +290,7 @@ int class_for_each_device(struct class *class, struct device *start,
 
        if (!class)
                return -EINVAL;
-       down(&class->p->sem);
+       down(&class->p->class_sem);
        list_for_each_entry(dev, &class->p->class_devices, node) {
                if (start) {
                        if (start == dev)
@@ -303,7 +303,7 @@ int class_for_each_device(struct class *class, struct device *start,
                if (error)
                        break;
        }
-       up(&class->p->sem);
+       up(&class->p->class_sem);
 
        return error;
 }
@@ -326,7 +326,7 @@ EXPORT_SYMBOL_GPL(class_for_each_device);
  *
  * Note, you will need to drop the reference with put_device() after use.
  *
- * We hold class->sem in this function, so it can not be
+ * We hold class->class_sem in this function, so it can not be
  * re-acquired in @match, otherwise it will self-deadlocking. For
  * example, calls to add or remove class members would be verboten.
  */
@@ -340,7 +340,7 @@ struct device *class_find_device(struct class *class, struct device *start,
        if (!class)
                return NULL;
 
-       down(&class->p->sem);
+       down(&class->p->class_sem);
        list_for_each_entry(dev, &class->p->class_devices, node) {
                if (start) {
                        if (start == dev)
@@ -354,7 +354,7 @@ struct device *class_find_device(struct class *class, struct device *start,
                } else
                        put_device(dev);
        }
-       up(&class->p->sem);
+       up(&class->p->class_sem);
 
        return found ? dev : NULL;
 }
@@ -372,13 +372,13 @@ int class_interface_register(struct class_interface *class_intf)
        if (!parent)
                return -EINVAL;
 
-       down(&parent->p->sem);
+       down(&parent->p->class_sem);
        list_add_tail(&class_intf->node, &parent->p->class_interfaces);
        if (class_intf->add_dev) {
                list_for_each_entry(dev, &parent->p->class_devices, node)
                        class_intf->add_dev(dev, class_intf);
        }
-       up(&parent->p->sem);
+       up(&parent->p->class_sem);
 
        return 0;
 }
@@ -391,13 +391,13 @@ void class_interface_unregister(struct class_interface *class_intf)
        if (!parent)
                return;
 
-       down(&parent->p->sem);
+       down(&parent->p->class_sem);
        list_del_init(&class_intf->node);
        if (class_intf->remove_dev) {
                list_for_each_entry(dev, &parent->p->class_devices, node)
                        class_intf->remove_dev(dev, class_intf);
        }
-       up(&parent->p->sem);
+       up(&parent->p->class_sem);
 
        class_put(parent);
 }

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 6e1cff296d9f03e20095c6334bde4d4786ce5f39..b90ae6f7be8607bdfa32df7867f7b372a214a99c 100644 (file)
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -907,7 +907,7 @@ int device_add(struct device *dev)
                klist_add_tail(&dev->knode_parent, &parent->klist_children);
 
        if (dev->class) {
-               down(&dev->class->p->sem);
+               down(&dev->class->p->class_sem);
                /* tie the class to the device */
                list_add_tail(&dev->node, &dev->class->p->class_devices);
 
@@ -916,7 +916,7 @@ int device_add(struct device *dev)
                                    &dev->class->p->class_interfaces, node)
                        if (class_intf->add_dev)
                                class_intf->add_dev(dev, class_intf);
-               up(&dev->class->p->sem);
+               up(&dev->class->p->class_sem);
        }
  Done:
        put_device(dev);
@@ -1017,7 +1017,7 @@ void device_del(struct device *dev)
        if (dev->class) {
                device_remove_class_symlinks(dev);
 
-               down(&dev->class->p->sem);
+               down(&dev->class->p->class_sem);
                /* notify any interfaces that the device is now gone */
                list_for_each_entry(class_intf,
                                    &dev->class->p->class_interfaces, node)
@@ -1025,7 +1025,7 @@ void device_del(struct device *dev)
                                class_intf->remove_dev(dev, class_intf);
                /* remove the device from the class list */
                list_del_init(&dev->node);
-               up(&dev->class->p->sem);
+               up(&dev->class->p->class_sem);
        }
        device_remove_file(dev, &uevent_attr);
        device_remove_attrs(dev);