Commit 57f2667c authored by Tejun Heo's avatar Tejun Heo Committed by Linus Torvalds

misc/tifm_core: convert to idr_alloc()

Convert to the much saner new idr interface.
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Alex Dubov <oakad@yahoo.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3ab4ee8f
...@@ -196,13 +196,14 @@ int tifm_add_adapter(struct tifm_adapter *fm) ...@@ -196,13 +196,14 @@ int tifm_add_adapter(struct tifm_adapter *fm)
{ {
int rc; int rc;
if (!idr_pre_get(&tifm_adapter_idr, GFP_KERNEL)) idr_preload(GFP_KERNEL);
return -ENOMEM;
spin_lock(&tifm_adapter_lock); spin_lock(&tifm_adapter_lock);
rc = idr_get_new(&tifm_adapter_idr, fm, &fm->id); rc = idr_alloc(&tifm_adapter_idr, fm, 0, 0, GFP_NOWAIT);
if (rc >= 0)
fm->id = rc;
spin_unlock(&tifm_adapter_lock); spin_unlock(&tifm_adapter_lock);
if (rc) idr_preload_end();
if (rc < 0)
return rc; return rc;
dev_set_name(&fm->dev, "tifm%u", fm->id); dev_set_name(&fm->dev, "tifm%u", fm->id);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment