diff options
| author | Jean Delvare <khali@linux-fr.org> | 2011-03-20 14:50:52 +0100 |
|---|---|---|
| committer | Jean Delvare <khali@endymion.delvare> | 2011-03-20 14:50:52 +0100 |
| commit | d735b34db30b7891ff76b552d18ecb0ce04a2bc2 (patch) | |
| tree | 5918a83db26444ee3e42fa9824efb54995abf0bd | |
| parent | 6ced9e6b3901af4ab6ac0a11231402c888286ea6 (diff) | |
| download | olio-linux-3.10-d735b34db30b7891ff76b552d18ecb0ce04a2bc2.tar.xz olio-linux-3.10-d735b34db30b7891ff76b552d18ecb0ce04a2bc2.zip | |
i2c: make i2c_get_adapter prototype clearer
Rename the parameter of i2c_get_adapter() to "nr", to make it clear we
are passing an adapter number and not an adapter ID (which have gone
away by now.)
Signed-off-by: Jean Delvare <khali@linux-fr.org>
| -rw-r--r-- | drivers/i2c/i2c-core.c | 4 | ||||
| -rw-r--r-- | include/linux/i2c.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 045ba6efea4..f7620cada78 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -1581,12 +1581,12 @@ i2c_new_probed_device(struct i2c_adapter *adap, } EXPORT_SYMBOL_GPL(i2c_new_probed_device); -struct i2c_adapter *i2c_get_adapter(int id) +struct i2c_adapter *i2c_get_adapter(int nr) { struct i2c_adapter *adapter; mutex_lock(&core_lock); - adapter = idr_find(&i2c_adapter_idr, id); + adapter = idr_find(&i2c_adapter_idr, nr); if (adapter && !try_module_get(adapter->owner)) adapter = NULL; diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 06a8d9c7de9..c1e70afe250 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -447,7 +447,7 @@ extern void i2c_release_client(struct i2c_client *client); extern void i2c_clients_command(struct i2c_adapter *adap, unsigned int cmd, void *arg); -extern struct i2c_adapter *i2c_get_adapter(int id); +extern struct i2c_adapter *i2c_get_adapter(int nr); extern void i2c_put_adapter(struct i2c_adapter *adap); |