power: convert to idr_alloc()

Convert to the much saner new idr interface.

Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Anton Vorontsov <cbou@mail.ru>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 2 insertions, 7 deletions

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) {