Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6: (46 commits)
  dev_dbg: check dev_dbg() arguments
  drivers/base/attribute_container.c: use mutex instead of binary semaphore
  mod_sysfs_setup() doesn't return errno when kobject_add_dir() failure occurs
  s2ram: add arch irq disable/enable hooks
  define platform wakeup hook, use in pci_enable_wake()
  security: prevent permission checking of file removal via sysfs_remove_group()
  device_schedule_callback() needs a module reference
  s390: cio: Delay uevents for subchannels
  sysfs: bin.c printk fix
  Driver core: use mutex instead of semaphore in DMA pool handler
  driver core: bus_add_driver should return an error if no bus
  debugfs: Add debugfs_create_u64()
  the overdue removal of the mount/umount uevents
  kobject: Comment and warning fixes to kobject.c
  Driver core: warn when userspace writes to the uevent file in a non-supported way
  Driver core: make uevent-environment available in uevent-file
  kobject core: remove rwsem from struct subsystem
  qeth: Remove usage of subsys.rwsem
  PHY: remove rwsem use from phy core
  IEEE1394: remove rwsem use from ieee1394 core
  ...

1 files changed, 13 insertions, 13 deletions

diff --git a/drivers/base/attribute_container.c b/drivers/base/attribute_container.c
index 22220733f76f..1ec0654665cf 100644
--- a/drivers/base/attribute_container.c
+++ b/drivers/base/attribute_container.c
@@ -62,7 +62,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 +77,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 +94,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 +102,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 +145,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 +173,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 +211,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 +234,7 @@ attribute_container_remove_device(struct device *dev,
                         }
                 }
         }
-        up(&attribute_container_mutex);
+        mutex_unlock(&attribute_container_mutex);
 }
 
 /**
@@ -255,7 +255,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 +273,7 @@ attribute_container_device_trigger(struct device *dev,
                                 fn(cont, dev, &ic->classdev);
                 }
         }
-        up(&attribute_container_mutex);
+        mutex_unlock(&attribute_container_mutex);
 }
 
 /**
@@ -295,12 +295,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);
 }
 
 /**