Merge tag 'mfd/wm5102' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc...

[cascardo/linux.git] / drivers / base / class.c

diff --git a/drivers/base/class.c b/drivers/base/class.c
index b80d91c..03243d4 100644 (file)
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -184,9 +184,9 @@ int __class_register(struct class *cls, struct lock_class_key *key)
        if (!cp)
                return -ENOMEM;
        klist_init(&cp->klist_devices, klist_class_dev_get, klist_class_dev_put);
-       INIT_LIST_HEAD(&cp->class_interfaces);
+       INIT_LIST_HEAD(&cp->interfaces);
        kset_init(&cp->glue_dirs);
-       __mutex_init(&cp->class_mutex, "struct class mutex", key);
+       __mutex_init(&cp->mutex, "subsys mutex", key);
        error = kobject_set_name(&cp->subsys.kobj, "%s", cls->name);
        if (error) {
                kfree(cp);
@@ -460,15 +460,15 @@ int class_interface_register(struct class_interface *class_intf)
        if (!parent)
                return -EINVAL;
 
-       mutex_lock(&parent->p->class_mutex);
-       list_add_tail(&class_intf->node, &parent->p->class_interfaces);
+       mutex_lock(&parent->p->mutex);
+       list_add_tail(&class_intf->node, &parent->p->interfaces);
        if (class_intf->add_dev) {
                class_dev_iter_init(&iter, parent, NULL, NULL);
                while ((dev = class_dev_iter_next(&iter)))
                        class_intf->add_dev(dev, class_intf);
                class_dev_iter_exit(&iter);
        }
-       mutex_unlock(&parent->p->class_mutex);
+       mutex_unlock(&parent->p->mutex);
 
        return 0;
 }
@@ -482,7 +482,7 @@ void class_interface_unregister(struct class_interface *class_intf)
        if (!parent)
                return;
 
-       mutex_lock(&parent->p->class_mutex);
+       mutex_lock(&parent->p->mutex);
        list_del_init(&class_intf->node);
        if (class_intf->remove_dev) {
                class_dev_iter_init(&iter, parent, NULL, NULL);
@@ -490,7 +490,7 @@ void class_interface_unregister(struct class_interface *class_intf)
                        class_intf->remove_dev(dev, class_intf);
                class_dev_iter_exit(&iter);
        }
-       mutex_unlock(&parent->p->class_mutex);
+       mutex_unlock(&parent->p->mutex);
 
        class_put(parent);
 }