Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / base / attribute_container.c

diff --git a/drivers/base/attribute_container.c b/drivers/base/attribute_container.c
index b84ca8f13f9e1361d51b82a90f29cc525fb9c33e..3ead3af4be6197b8addaafd375d247e8f8c38f70 100644 (file)
--- a/drivers/base/attribute_container.c
+++ b/drivers/base/attribute_container.c
@@ -74,9 +74,9 @@ int
 attribute_container_register(struct attribute_container *cont)
 {
        INIT_LIST_HEAD(&cont->node);
-       klist_init(&cont->containers,internal_container_klist_get,
+       klist_init(&cont->containers, internal_container_klist_get,
                   internal_container_klist_put);
-               
+
        mutex_lock(&attribute_container_mutex);
        list_add_tail(&cont->node, &attribute_container_list);
        mutex_unlock(&attribute_container_mutex);
@@ -104,14 +104,14 @@ attribute_container_unregister(struct attribute_container *cont)
        spin_unlock(&cont->containers.k_lock);
        mutex_unlock(&attribute_container_mutex);
        return retval;
-               
+
 }
 EXPORT_SYMBOL_GPL(attribute_container_unregister);
 
 /* private function used as class release */
 static void attribute_container_release(struct device *classdev)
 {
-       struct internal_container *ic 
+       struct internal_container *ic
                = container_of(classdev, struct internal_container, classdev);
        struct device *dev = classdev->parent;
 
@@ -184,8 +184,8 @@ attribute_container_add_device(struct device *dev,
                struct klist_node *n = klist_next(iter); \
                n ? container_of(n, typeof(*pos), member) : \
                        ({ klist_iter_exit(iter) ; NULL; }); \
-       }) ) != NULL; )
-                       
+       })) != NULL;)
+
 
 /**
  * attribute_container_remove_device - make device eligible for removal.
@@ -247,7 +247,7 @@ attribute_container_remove_device(struct device *dev,
  * container, then use attribute_container_trigger() instead.
  */
 void
-attribute_container_device_trigger(struct device *dev, 
+attribute_container_device_trigger(struct device *dev,
                                   int (*fn)(struct attribute_container *,
                                             struct device *,
                                             struct device *))