1 files changed, 11 insertions, 58 deletions

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index e388590b44ab..991d38daa87d 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -935,25 +935,17 @@ out_list:
  */
 int i2c_add_adapter(struct i2c_adapter *adapter)
 {
-        int     id, res = 0;
-
-retry:
-        if (idr_pre_get(&i2c_adapter_idr, GFP_KERNEL) == 0)
-                return -ENOMEM;
+        int id;
 
         mutex_lock(&core_lock);
-        /* "above" here means "above or equal to", sigh */
-        res = idr_get_new_above(&i2c_adapter_idr, adapter,
-                                __i2c_first_dynamic_bus_num, &id);
+        id = idr_alloc(&i2c_adapter_idr, adapter,
+                       __i2c_first_dynamic_bus_num, 0, GFP_KERNEL);
         mutex_unlock(&core_lock);
-
-        if (res < 0) {
-                if (res == -EAGAIN)
-                        goto retry;
-                return res;
-        }
+        if (id < 0)
+                return id;
 
         adapter->nr = id;
+
         return i2c_register_adapter(adapter);
 }
 EXPORT_SYMBOL(i2c_add_adapter);
@@ -984,33 +976,17 @@ EXPORT_SYMBOL(i2c_add_adapter);
 int i2c_add_numbered_adapter(struct i2c_adapter *adap)
 {
         int     id;
-        int     status;
 
         if (adap->nr == -1) /* -1 means dynamically assign bus id */
                 return i2c_add_adapter(adap);
-        if (adap->nr & ~MAX_IDR_MASK)
-                return -EINVAL;
-
-retry:
-        if (idr_pre_get(&i2c_adapter_idr, GFP_KERNEL) == 0)
-                return -ENOMEM;
 
         mutex_lock(&core_lock);
-        /* "above" here means "above or equal to", sigh;
-         * we need the "equal to" result to force the result
-         */
-        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);
-        }
+        id = idr_alloc(&i2c_adapter_idr, adap, adap->nr, adap->nr + 1,
+                       GFP_KERNEL);
         mutex_unlock(&core_lock);
-        if (status == -EAGAIN)
-                goto retry;
-
-        if (status == 0)
-                status = i2c_register_adapter(adap);
-        return status;
+        if (id < 0)
+                return id == -ENOSPC ? -EBUSY : id;
+        return i2c_register_adapter(adap);
 }
 EXPORT_SYMBOL_GPL(i2c_add_numbered_adapter);
 
@@ -1866,29 +1842,6 @@ s32 i2c_smbus_write_word_data(const struct i2c_client *client, u8 command,
 EXPORT_SYMBOL(i2c_smbus_write_word_data);
 
 /**
- * i2c_smbus_process_call - SMBus "process call" protocol
- * @client: Handle to slave device
- * @command: Byte interpreted by slave
- * @value: 16-bit "word" being written
- *
- * This executes the SMBus "process call" protocol, returning negative errno
- * else a 16-bit unsigned "word" received from the device.
- */
-s32 i2c_smbus_process_call(const struct i2c_client *client, u8 command,
-                           u16 value)
-{
-        union i2c_smbus_data data;
-        int status;
-        data.word = value;
-
-        status = i2c_smbus_xfer(client->adapter, client->addr, client->flags,
-                                I2C_SMBUS_WRITE, command,
-                                I2C_SMBUS_PROC_CALL, &data);
-        return (status < 0) ? status : data.word;
-}
-EXPORT_SYMBOL(i2c_smbus_process_call);
-
-/**
  * i2c_smbus_read_block_data - SMBus "block read" protocol
  * @client: Handle to slave device
  * @command: Byte interpreted by slave