4 files changed, 14 insertions, 13 deletions

diff --git a/drivers/message/i2o/device.c b/drivers/message/i2o/device.c
index 611adc3c0f74..489d7c5c4965 100644
--- a/drivers/message/i2o/device.c
+++ b/drivers/message/i2o/device.c
@@ -62,7 +62,7 @@ int i2o_device_claim(struct i2o_device *dev)
 {
         int rc = 0;
 
-        down(&dev->lock);
+        mutex_lock(&dev->lock);
 
         rc = i2o_device_issue_claim(dev, I2O_CMD_UTIL_CLAIM, I2O_CLAIM_PRIMARY);
         if (!rc)
@@ -72,7 +72,7 @@ int i2o_device_claim(struct i2o_device *dev)
                 pr_debug("i2o: claim of device %d failed %d\n",
                          dev->lct_data.tid, rc);
 
-        up(&dev->lock);
+        mutex_unlock(&dev->lock);
 
         return rc;
 }
@@ -96,7 +96,7 @@ int i2o_device_claim_release(struct i2o_device *dev)
         int tries;
         int rc = 0;
 
-        down(&dev->lock);
+        mutex_lock(&dev->lock);
 
         /*
          *      If the controller takes a nonblocking approach to
@@ -118,7 +118,7 @@ int i2o_device_claim_release(struct i2o_device *dev)
                 pr_debug("i2o: claim release of device %d failed %d\n",
                          dev->lct_data.tid, rc);
 
-        up(&dev->lock);
+        mutex_unlock(&dev->lock);
 
         return rc;
 }
@@ -198,7 +198,7 @@ static struct i2o_device *i2o_device_alloc(void)
                 return ERR_PTR(-ENOMEM);
 
         INIT_LIST_HEAD(&dev->list);
-        init_MUTEX(&dev->lock);
+        mutex_init(&dev->lock);
 
         dev->device.bus = &i2o_bus_type;
         dev->device.release = &i2o_device_release;
@@ -326,7 +326,7 @@ int i2o_device_parse_lct(struct i2o_controller *c)
         u16 table_size;
         u32 buf;
 
-        down(&c->lct_lock);
+        mutex_lock(&c->lct_lock);
 
         kfree(c->lct);
 
@@ -335,7 +335,7 @@ int i2o_device_parse_lct(struct i2o_controller *c)
 
         lct = c->lct = kmalloc(table_size * 4, GFP_KERNEL);
         if (!lct) {
-                up(&c->lct_lock);
+                mutex_unlock(&c->lct_lock);
                 return -ENOMEM;
         }
 
@@ -408,7 +408,7 @@ int i2o_device_parse_lct(struct i2o_controller *c)
                         i2o_device_remove(dev);
         }
 
-        up(&c->lct_lock);
+        mutex_unlock(&c->lct_lock);
 
         return 0;
 }
diff --git a/drivers/message/i2o/exec-osm.c b/drivers/message/i2o/exec-osm.c
index 5278aad92bc4..c13b9321e7ab 100644
--- a/drivers/message/i2o/exec-osm.c
+++ b/drivers/message/i2o/exec-osm.c
@@ -537,7 +537,7 @@ static int i2o_exec_lct_notify(struct i2o_controller *c, u32 change_ind)
         struct device *dev;
         struct i2o_message *msg;
 
-        down(&c->lct_lock);
+        mutex_lock(&c->lct_lock);
 
         dev = &c->pdev->dev;
 
@@ -561,7 +561,7 @@ static int i2o_exec_lct_notify(struct i2o_controller *c, u32 change_ind)
 
         i2o_msg_post(c, msg);
 
-        up(&c->lct_lock);
+        mutex_unlock(&c->lct_lock);
 
         return 0;
 };
diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
index 3305c12372a2..a1ec16a075c6 100644
--- a/drivers/message/i2o/iop.c
+++ b/drivers/message/i2o/iop.c
@@ -1067,7 +1067,7 @@ struct i2o_controller *i2o_iop_alloc(void)
 
         INIT_LIST_HEAD(&c->devices);
         spin_lock_init(&c->lock);
-        init_MUTEX(&c->lct_lock);
+        mutex_init(&c->lct_lock);
 
         device_initialize(&c->device);
 
diff --git a/include/linux/i2o.h b/include/linux/i2o.h
index 52f53e2e70c3..333a370a3bdc 100644
--- a/include/linux/i2o.h
+++ b/include/linux/i2o.h
@@ -31,6 +31,7 @@
 #include <linux/slab.h>
 #include <linux/workqueue.h>    /* work_struct */
 #include <linux/mempool.h>
+#include <linux/mutex.h>
 
 #include <asm/io.h>
 #include <asm/semaphore.h>      /* Needed for MUTEX init macros */
@@ -425,7 +426,7 @@ struct i2o_device {
 
         struct device device;
 
-        struct semaphore lock;  /* device lock */
+        struct mutex lock;      /* device lock */
 };
 
 /*
@@ -544,7 +545,7 @@ struct i2o_controller {
         struct i2o_dma hrt;     /* HW Resource Table */
         i2o_lct *lct;           /* Logical Config Table */
         struct i2o_dma dlct;    /* Temp LCT */
-        struct semaphore lct_lock;      /* Lock for LCT updates */
+        struct mutex lct_lock;  /* Lock for LCT updates */
         struct i2o_dma status_block;    /* IOP status block */
 
         struct i2o_io base;     /* controller messaging unit */