lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

i2c: convert to idr_alloc()

Browse Source 
Convert to the much saner new idr interface.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Jean Delvare <khali@linux-fr.org>
Cc: Wolfram Sang <wolfram@the-dreams.de>
Tested-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Tejun Heo
2013-02-27 17:04:15 -08:00
committed by Linus Torvalds
parent cc39a8faed
commit 4ae42b0ff0
1 changed files with 11 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/i2c/i2c-core.c
View File

@@ -935,25 +935,17 @@ out_list:
*/ */
int i2c_add_adapter(struct i2c_adapter *adapter) int i2c_add_adapter(struct i2c_adapter *adapter)
{ {
int id, res = 0; int id;
retry:
if (idr_pre_get(&i2c_adapter_idr, GFP_KERNEL) == 0)
return -ENOMEM;
mutex_lock(&core_lock); mutex_lock(&core_lock);
/* "above" here means "above or equal to", sigh */ id = idr_alloc(&i2c_adapter_idr, adapter,
res = idr_get_new_above(&i2c_adapter_idr, adapter, __i2c_first_dynamic_bus_num, 0, GFP_KERNEL);
__i2c_first_dynamic_bus_num, &id);
mutex_unlock(&core_lock); mutex_unlock(&core_lock);
if (id < 0)
if (res < 0) { return id;
if (res == -EAGAIN)
goto retry;
return res;
}
adapter->nr = id; adapter->nr = id;
return i2c_register_adapter(adapter); return i2c_register_adapter(adapter);
} }
EXPORT_SYMBOL(i2c_add_adapter); EXPORT_SYMBOL(i2c_add_adapter);
@@ -984,33 +976,19 @@ EXPORT_SYMBOL(i2c_add_adapter);
int i2c_add_numbered_adapter(struct i2c_adapter *adap) int i2c_add_numbered_adapter(struct i2c_adapter *adap)
{ {
int id; int id;
int status;
if (adap->nr == -1) /* -1 means dynamically assign bus id */ if (adap->nr == -1) /* -1 means dynamically assign bus id */
return i2c_add_adapter(adap); return i2c_add_adapter(adap);
if (adap->nr & ~MAX_IDR_MASK) if (adap->nr & ~MAX_IDR_MASK)
return -EINVAL; return -EINVAL;
retry:
if (idr_pre_get(&i2c_adapter_idr, GFP_KERNEL) == 0)
return -ENOMEM;
mutex_lock(&core_lock); mutex_lock(&core_lock);
/* "above" here means "above or equal to", sigh; id = idr_alloc(&i2c_adapter_idr, adap, adap->nr, adap->nr + 1,
* we need the "equal to" result to force the result GFP_KERNEL);
*/
status = idr_get_new_above(&i2c_adapter_idr, adap, adap->nr, &id);
if (status == 0 && id != adap->nr) {
status = -EBUSY;
idr_remove(&i2c_adapter_idr, id);
}
mutex_unlock(&core_lock); mutex_unlock(&core_lock);
if (status == -EAGAIN) if (id < 0)
goto retry; return id == -ENOSPC ? -EBUSY : id;
return i2c_register_adapter(adap);
if (status == 0)
status = i2c_register_adapter(adap);
return status;
} }
EXPORT_SYMBOL_GPL(i2c_add_numbered_adapter); EXPORT_SYMBOL_GPL(i2c_add_numbered_adapter);