3 files changed, 8 insertions, 21 deletions

diff --git a/drivers/power/bq2415x_charger.c b/drivers/power/bq2415x_charger.c
index ca91396fc48e..0727f9256138 100644
--- a/drivers/power/bq2415x_charger.c
+++ b/drivers/power/bq2415x_charger.c
@@ -1515,16 +1515,11 @@ static int bq2415x_probe(struct i2c_client *client,
         }
 
         /* Get new ID for the new device */
-        ret = idr_pre_get(&bq2415x_id, GFP_KERNEL);
-        if (ret == 0)
-                return -ENOMEM;
-
         mutex_lock(&bq2415x_id_mutex);
-        ret = idr_get_new(&bq2415x_id, client, &num);
+        num = idr_alloc(&bq2415x_id, client, 0, 0, GFP_KERNEL);
         mutex_unlock(&bq2415x_id_mutex);
-
-        if (ret < 0)
-                return ret;
+        if (num < 0)
+                return num;
 
         name = kasprintf(GFP_KERNEL, "%s-%d", id->name, num);
         if (!name) {
diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
index 8ccf5d7d0add..26037ca7efb4 100644
--- a/drivers/power/bq27x00_battery.c
+++ b/drivers/power/bq27x00_battery.c
@@ -791,14 +791,11 @@ static int bq27x00_battery_probe(struct i2c_client *client,
         int retval = 0;
 
         /* Get new ID for the new battery device */
-        retval = idr_pre_get(&battery_id, GFP_KERNEL);
-        if (retval == 0)
-                return -ENOMEM;
         mutex_lock(&battery_mutex);
-        retval = idr_get_new(&battery_id, client, &num);
+        num = idr_alloc(&battery_id, client, 0, 0, GFP_KERNEL);
         mutex_unlock(&battery_mutex);
-        if (retval < 0)
-                return retval;
+        if (num < 0)
+                return num;
 
         name = kasprintf(GFP_KERNEL, "%s-%d", id->name, num);
         if (!name) {
diff --git a/drivers/power/ds2782_battery.c b/drivers/power/ds2782_battery.c
index e7301b3ed623..c09e7726c96c 100644
--- a/drivers/power/ds2782_battery.c
+++ b/drivers/power/ds2782_battery.c
@@ -395,17 +395,12 @@ static int ds278x_battery_probe(struct i2c_client *client,
         }
 
         /* Get an ID for this battery */
-        ret = idr_pre_get(&battery_id, GFP_KERNEL);
-        if (ret == 0) {
-                ret = -ENOMEM;
-                goto fail_id;
-        }
-
         mutex_lock(&battery_lock);
-        ret = idr_get_new(&battery_id, client, &num);
+        ret = idr_alloc(&battery_id, client, 0, 0, GFP_KERNEL);
         mutex_unlock(&battery_lock);
         if (ret < 0)
                 goto fail_id;
+        num = ret;
 
         info = kzalloc(sizeof(*info), GFP_KERNEL);
         if (!info) {