提交 97ae69fd 编写于 作者: G Greg Kroah-Hartman

class: rename "devices" to "class_devices" in internal class structure

This renames the struct class "devices" field to be "class_devices" 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: NGreg Kroah-Hartman <gregkh@suse.de>
上级 7c71448b
...@@ -42,7 +42,7 @@ struct driver_private { ...@@ -42,7 +42,7 @@ struct driver_private {
* *
* @subsys - the struct kset that defines this class. This is the main kobject * @subsys - the struct kset that defines this class. This is the main kobject
* @children - list of class_devices associated with this class * @children - list of class_devices associated with this class
* @devices - list of devices associated with this class * @class_devices - list of devices associated with this class
* @interfaces - list of class_interfaces associated with this class * @interfaces - list of class_interfaces associated with this class
* @class_dirs - * @class_dirs -
* @sem - semaphore to protect the children, devices, and interfaces lists. * @sem - semaphore to protect the children, devices, and interfaces lists.
...@@ -55,7 +55,7 @@ struct driver_private { ...@@ -55,7 +55,7 @@ struct driver_private {
*/ */
struct class_private { struct class_private {
struct kset subsys; struct kset subsys;
struct list_head devices; struct list_head class_devices;
struct list_head interfaces; struct list_head interfaces;
struct kset class_dirs; struct kset class_dirs;
struct semaphore sem; struct semaphore sem;
......
...@@ -143,7 +143,7 @@ int class_register(struct class *cls) ...@@ -143,7 +143,7 @@ int class_register(struct class *cls)
cp = kzalloc(sizeof(*cp), GFP_KERNEL); cp = kzalloc(sizeof(*cp), GFP_KERNEL);
if (!cp) if (!cp)
return -ENOMEM; return -ENOMEM;
INIT_LIST_HEAD(&cp->devices); INIT_LIST_HEAD(&cp->class_devices);
INIT_LIST_HEAD(&cp->interfaces); INIT_LIST_HEAD(&cp->interfaces);
kset_init(&cp->class_dirs); kset_init(&cp->class_dirs);
init_MUTEX(&cp->sem); init_MUTEX(&cp->sem);
...@@ -290,7 +290,7 @@ int class_for_each_device(struct class *class, struct device *start, ...@@ -290,7 +290,7 @@ int class_for_each_device(struct class *class, struct device *start,
if (!class) if (!class)
return -EINVAL; return -EINVAL;
down(&class->p->sem); down(&class->p->sem);
list_for_each_entry(dev, &class->p->devices, node) { list_for_each_entry(dev, &class->p->class_devices, node) {
if (start) { if (start) {
if (start == dev) if (start == dev)
start = NULL; start = NULL;
...@@ -340,7 +340,7 @@ struct device *class_find_device(struct class *class, struct device *start, ...@@ -340,7 +340,7 @@ struct device *class_find_device(struct class *class, struct device *start,
return NULL; return NULL;
down(&class->p->sem); down(&class->p->sem);
list_for_each_entry(dev, &class->p->devices, node) { list_for_each_entry(dev, &class->p->class_devices, node) {
if (start) { if (start) {
if (start == dev) if (start == dev)
start = NULL; start = NULL;
...@@ -374,7 +374,7 @@ int class_interface_register(struct class_interface *class_intf) ...@@ -374,7 +374,7 @@ int class_interface_register(struct class_interface *class_intf)
down(&parent->p->sem); down(&parent->p->sem);
list_add_tail(&class_intf->node, &parent->p->interfaces); list_add_tail(&class_intf->node, &parent->p->interfaces);
if (class_intf->add_dev) { if (class_intf->add_dev) {
list_for_each_entry(dev, &parent->p->devices, node) list_for_each_entry(dev, &parent->p->class_devices, node)
class_intf->add_dev(dev, class_intf); class_intf->add_dev(dev, class_intf);
} }
up(&parent->p->sem); up(&parent->p->sem);
...@@ -393,7 +393,7 @@ void class_interface_unregister(struct class_interface *class_intf) ...@@ -393,7 +393,7 @@ void class_interface_unregister(struct class_interface *class_intf)
down(&parent->p->sem); down(&parent->p->sem);
list_del_init(&class_intf->node); list_del_init(&class_intf->node);
if (class_intf->remove_dev) { if (class_intf->remove_dev) {
list_for_each_entry(dev, &parent->p->devices, node) list_for_each_entry(dev, &parent->p->class_devices, node)
class_intf->remove_dev(dev, class_intf); class_intf->remove_dev(dev, class_intf);
} }
up(&parent->p->sem); up(&parent->p->sem);
......
...@@ -906,7 +906,7 @@ int device_add(struct device *dev) ...@@ -906,7 +906,7 @@ int device_add(struct device *dev)
if (dev->class) { if (dev->class) {
down(&dev->class->p->sem); down(&dev->class->p->sem);
/* tie the class to the device */ /* tie the class to the device */
list_add_tail(&dev->node, &dev->class->p->devices); list_add_tail(&dev->node, &dev->class->p->class_devices);
/* notify any interfaces that the device is here */ /* notify any interfaces that the device is here */
list_for_each_entry(class_intf, &dev->class->p->interfaces, list_for_each_entry(class_intf, &dev->class->p->interfaces,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册