Use mutexes instead of semaphores in I2O driver
The I2O driver uses two semaphores as mutexes. Use the mutex API instead of the (binary) semaphores. Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:

committed by
Linus Torvalds

parent
1c6b4aa945
commit
9ac162521c
@@ -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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user