ide: don't BUG() on unsupported transfer modes

[linux-2.6-omap-h63xx.git] / drivers / base / attribute_container.c

diff --git a/drivers/base/attribute_container.c b/drivers/base/attribute_container.c
index 22220733f76f5dbf417b1f1df670e561a6fb9192..7370d7cf59888050d374d7a48a03185a06f0df7c 100644 (file)
--- a/drivers/base/attribute_container.c
+++ b/drivers/base/attribute_container.c
@@ -18,6 +18,7 @@
 #include <linux/slab.h>
 #include <linux/list.h>
 #include <linux/module.h>
+#include <linux/mutex.h>
 
 #include "base.h"
 
@@ -62,7 +63,7 @@ EXPORT_SYMBOL_GPL(attribute_container_classdev_to_container);
 
 static struct list_head attribute_container_list;
 
-static DECLARE_MUTEX(attribute_container_mutex);
+static DEFINE_MUTEX(attribute_container_mutex);
 
 /**
  * attribute_container_register - register an attribute container
@@ -77,9 +78,9 @@ attribute_container_register(struct attribute_container *cont)
        klist_init(&cont->containers,internal_container_klist_get,
                   internal_container_klist_put);
                
-       down(&attribute_container_mutex);
+       mutex_lock(&attribute_container_mutex);
        list_add_tail(&cont->node, &attribute_container_list);
-       up(&attribute_container_mutex);
+       mutex_unlock(&attribute_container_mutex);
 
        return 0;
 }
@@ -94,7 +95,7 @@ int
 attribute_container_unregister(struct attribute_container *cont)
 {
        int retval = -EBUSY;
-       down(&attribute_container_mutex);
+       mutex_lock(&attribute_container_mutex);
        spin_lock(&cont->containers.k_lock);
        if (!list_empty(&cont->containers.k_list))
                goto out;
@@ -102,7 +103,7 @@ attribute_container_unregister(struct attribute_container *cont)
        list_del(&cont->node);
  out:
        spin_unlock(&cont->containers.k_lock);
-       up(&attribute_container_mutex);
+       mutex_unlock(&attribute_container_mutex);
        return retval;
                
 }
@@ -145,7 +146,7 @@ attribute_container_add_device(struct device *dev,
 {
        struct attribute_container *cont;
 
-       down(&attribute_container_mutex);
+       mutex_lock(&attribute_container_mutex);
        list_for_each_entry(cont, &attribute_container_list, node) {
                struct internal_container *ic;
 
@@ -173,7 +174,7 @@ attribute_container_add_device(struct device *dev,
                        attribute_container_add_class_device(&ic->classdev);
                klist_add_tail(&ic->node, &cont->containers);
        }
-       up(&attribute_container_mutex);
+       mutex_unlock(&attribute_container_mutex);
 }
 
 /* FIXME: can't break out of this unless klist_iter_exit is also
@@ -211,7 +212,7 @@ attribute_container_remove_device(struct device *dev,
 {
        struct attribute_container *cont;
 
-       down(&attribute_container_mutex);
+       mutex_lock(&attribute_container_mutex);
        list_for_each_entry(cont, &attribute_container_list, node) {
                struct internal_container *ic;
                struct klist_iter iter;
@@ -234,7 +235,7 @@ attribute_container_remove_device(struct device *dev,
                        }
                }
        }
-       up(&attribute_container_mutex);
+       mutex_unlock(&attribute_container_mutex);
 }
 
 /**
@@ -255,7 +256,7 @@ attribute_container_device_trigger(struct device *dev,
 {
        struct attribute_container *cont;
 
-       down(&attribute_container_mutex);
+       mutex_lock(&attribute_container_mutex);
        list_for_each_entry(cont, &attribute_container_list, node) {
                struct internal_container *ic;
                struct klist_iter iter;
@@ -273,7 +274,7 @@ attribute_container_device_trigger(struct device *dev,
                                fn(cont, dev, &ic->classdev);
                }
        }
-       up(&attribute_container_mutex);
+       mutex_unlock(&attribute_container_mutex);
 }
 
 /**
@@ -295,12 +296,12 @@ attribute_container_trigger(struct device *dev,
 {
        struct attribute_container *cont;
 
-       down(&attribute_container_mutex);
+       mutex_lock(&attribute_container_mutex);
        list_for_each_entry(cont, &attribute_container_list, node) {
                if (cont->match(cont, dev))
                        fn(cont, dev);
        }
-       up(&attribute_container_mutex);
+       mutex_unlock(&attribute_container_mutex);
 }
 
 /**