summaryrefslogtreecommitdiffstats
path: root/drivers/base/class.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2008-05-28 09:28:39 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2008-07-21 21:54:51 -0700
commit97ae69fdbaa71a8f7dbc20bf10fb349d1759152f (patch)
tree9d8c3842cf7e1d43d67c265e5e69a964df541cd1 /drivers/base/class.c
parent7c71448b8aa80123fc521563d5f7c63a099d97ab (diff)
downloadblackbird-op-linux-97ae69fdbaa71a8f7dbc20bf10fb349d1759152f.tar.gz
blackbird-op-linux-97ae69fdbaa71a8f7dbc20bf10fb349d1759152f.zip
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: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/base/class.c')
-rw-r--r--drivers/base/class.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/base/class.c b/drivers/base/class.c
index 06f09c929a91..9947560def65 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -143,7 +143,7 @@ int class_register(struct class *cls)
cp = kzalloc(sizeof(*cp), GFP_KERNEL);
if (!cp)
return -ENOMEM;
- INIT_LIST_HEAD(&cp->devices);
+ INIT_LIST_HEAD(&cp->class_devices);
INIT_LIST_HEAD(&cp->interfaces);
kset_init(&cp->class_dirs);
init_MUTEX(&cp->sem);
@@ -290,7 +290,7 @@ int class_for_each_device(struct class *class, struct device *start,
if (!class)
return -EINVAL;
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 == dev)
start = NULL;
@@ -340,7 +340,7 @@ struct device *class_find_device(struct class *class, struct device *start,
return NULL;
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 == dev)
start = NULL;
@@ -374,7 +374,7 @@ int class_interface_register(struct class_interface *class_intf)
down(&parent->p->sem);
list_add_tail(&class_intf->node, &parent->p->interfaces);
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);
}
up(&parent->p->sem);
@@ -393,7 +393,7 @@ void class_interface_unregister(struct class_interface *class_intf)
down(&parent->p->sem);
list_del_init(&class_intf->node);
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);
}
up(&parent->p->sem);
OpenPOWER on IntegriCloud