diff options
author | Tejun Heo <tj@kernel.org> | 2013-02-27 20:04:37 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-27 22:10:18 -0500 |
commit | 05e2cefab4acb5ae9b54266935eeec32cc5269ea (patch) | |
tree | cdc76b603dbaea3da58dc7c2967dfd59f67c0fa0 /drivers/power/bq27x00_battery.c | |
parent | 2fa532c5d5af8959d1b0ea369324f6d44183dba4 (diff) |
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/bq27x00_battery.c')
-rw-r--r-- | drivers/power/bq27x00_battery.c | 9 |
1 files changed, 3 insertions, 6 deletions
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, | |||
791 | int retval = 0; | 791 | int retval = 0; |
792 | 792 | ||
793 | /* Get new ID for the new battery device */ | 793 | /* Get new ID for the new battery device */ |
794 | retval = idr_pre_get(&battery_id, GFP_KERNEL); | ||
795 | if (retval == 0) | ||
796 | return -ENOMEM; | ||
797 | mutex_lock(&battery_mutex); | 794 | mutex_lock(&battery_mutex); |
798 | retval = idr_get_new(&battery_id, client, &num); | 795 | num = idr_alloc(&battery_id, client, 0, 0, GFP_KERNEL); |
799 | mutex_unlock(&battery_mutex); | 796 | mutex_unlock(&battery_mutex); |
800 | if (retval < 0) | 797 | if (num < 0) |
801 | return retval; | 798 | return num; |
802 | 799 | ||
803 | name = kasprintf(GFP_KERNEL, "%s-%d", id->name, num); | 800 | name = kasprintf(GFP_KERNEL, "%s-%d", id->name, num); |
804 | if (!name) { | 801 | if (!name) { |