summaryrefslogtreecommitdiff
path: root/drivers/power/ds2782_battery.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2013-02-28 05:04:37 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-28 07:10:18 +0400
commit05e2cefab4acb5ae9b54266935eeec32cc5269ea (patch)
treecdc76b603dbaea3da58dc7c2967dfd59f67c0fa0 /drivers/power/ds2782_battery.c
parent2fa532c5d5af8959d1b0ea369324f6d44183dba4 (diff)
downloadlinux-05e2cefab4acb5ae9b54266935eeec32cc5269ea.tar.xz
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>
Diffstat (limited to 'drivers/power/ds2782_battery.c')
-rw-r--r--drivers/power/ds2782_battery.c9
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) {