From 5a164151fe7345708e6ebd8ecb4d919c16ed4e43 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Wed, 27 Feb 2013 17:04:37 -0800
Subject: [PATCH] --- yaml --- r: 359359 b: refs/heads/master c:
 05e2cefab4acb5ae9b54266935eeec32cc5269ea h: refs/heads/master i:   359357:
 e4ccb707823fc894a955dd818aed66e1838155c3   359355:
 e7819f86e6ba280bba34e06f528e1a678c70fc1f   359351:
 7f6d45c3729d0ffec70f8cf7781e04b9147d3364   359343:
 b3b04a1fec3eae4bf2d5f0858df9de62c5a2d07b   359327:
 a0d0aa6cc986bdf9025c72fe36484b60f2e1b93d   359295:
 263e944996efad16e0ac9009b9cd4137b29b4300 v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/power/bq2415x_charger.c | 11 +++--------
 trunk/drivers/power/bq27x00_battery.c |  9 +++------
 trunk/drivers/power/ds2782_battery.c  |  9 ++-------
 4 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/[refs] b/[refs]
index 83bc1f446bf2..06e6a8bafaa2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fa532c5d5af8959d1b0ea369324f6d44183dba4
+refs/heads/master: 05e2cefab4acb5ae9b54266935eeec32cc5269ea
diff --git a/trunk/drivers/power/bq2415x_charger.c b/trunk/drivers/power/bq2415x_charger.c
index ca91396fc48e..0727f9256138 100644
--- a/trunk/drivers/power/bq2415x_charger.c
+++ b/trunk/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/trunk/drivers/power/bq27x00_battery.c b/trunk/drivers/power/bq27x00_battery.c
index 8ccf5d7d0add..26037ca7efb4 100644
--- a/trunk/drivers/power/bq27x00_battery.c
+++ b/trunk/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/trunk/drivers/power/ds2782_battery.c b/trunk/drivers/power/ds2782_battery.c
index e7301b3ed623..c09e7726c96c 100644
--- a/trunk/drivers/power/ds2782_battery.c
+++ b/trunk/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) {