mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-06 10:57:46 +00:00
Code Issues Releases Wiki Activity

class: rename "interfaces" to "class_interfaces" in internal class structure

Browse source 
This renames the struct class "interfaces" field to be
"class_interfaces" 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 97ae69fdba
commit 184f1f779d
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/base/base.h
View file

@ -43,7 +43,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
* @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 * @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.
* @class - pointer back to the struct class that this structure is associated * @class - pointer back to the struct class that this structure is associated
@ -56,7 +56,7 @@ struct driver_private {
struct class_private { struct class_private {
struct kset subsys; struct kset subsys;
struct list_head class_devices; struct list_head class_devices;
struct list_head interfaces; struct list_head class_interfaces;
struct kset class_dirs; struct kset class_dirs;
struct semaphore sem; struct semaphore sem;
struct class *class; struct class *class;

4
drivers/base/class.c
View file

@ -144,7 +144,7 @@ int class_register(struct class *cls)
if (!cp) if (!cp)
return -ENOMEM; return -ENOMEM;
INIT_LIST_HEAD(&cp->class_devices); INIT_LIST_HEAD(&cp->class_devices);
INIT_LIST_HEAD(&cp->interfaces); INIT_LIST_HEAD(&cp->class_interfaces);
kset_init(&cp->class_dirs); kset_init(&cp->class_dirs);
init_MUTEX(&cp->sem); init_MUTEX(&cp->sem);
error = kobject_set_name(&cp->subsys.kobj, "%s", cls->name); error = kobject_set_name(&cp->subsys.kobj, "%s", cls->name);
@ -372,7 +372,7 @@ int class_interface_register(struct class_interface *class_intf)
return -EINVAL; return -EINVAL;
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->class_interfaces);
if (class_intf->add_dev) { if (class_intf->add_dev) {
list_for_each_entry(dev, &parent->p->class_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);

8
drivers/base/core.c
View file

@ -909,8 +909,8 @@ int device_add(struct device *dev)
list_add_tail(&dev->node, &dev->class->p->class_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,
node) &dev->class->p->class_interfaces, node)
if (class_intf->add_dev) if (class_intf->add_dev)
class_intf->add_dev(dev, class_intf); class_intf->add_dev(dev, class_intf);
up(&dev->class->p->sem); up(&dev->class->p->sem);
@ -1016,8 +1016,8 @@ void device_del(struct device *dev)
down(&dev->class->p->sem); down(&dev->class->p->sem);
/* notify any interfaces that the device is now gone */ /* notify any interfaces that the device is now gone */
list_for_each_entry(class_intf, &dev->class->p->interfaces, list_for_each_entry(class_intf,
node) &dev->class->p->class_interfaces, node)
if (class_intf->remove_dev) if (class_intf->remove_dev)
class_intf->remove_dev(dev, class_intf); class_intf->remove_dev(dev, class_intf);
/* remove the device from the class list */ /* remove the device from the class list */