xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Greg Kroah-Hartman
2008-05-28 09:28:39 -07:00
parent 1fbfee6c6d
commit d9a0157328
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/base/class.c
View File

@@ -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);
}