diff options
| author | Tejun Heo <tj@kernel.org> | 2013-02-27 17:04:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-27 19:10:17 -0800 |
| commit | 57f2667cc7ebf69bd5fdb26f132228d331766ea8 (patch) | |
| tree | 9dbff0a6cc5cbe9d525835edacb606ded129f2d0 /drivers/misc | |
| parent | 3ab4ee8f809cac9587e6795243349beda179f6ff (diff) | |
| download | linux-57f2667cc7ebf69bd5fdb26f132228d331766ea8.tar.gz linux-57f2667cc7ebf69bd5fdb26f132228d331766ea8.tar.bz2 linux-57f2667cc7ebf69bd5fdb26f132228d331766ea8.zip | |
misc/tifm_core: convert to idr_alloc()
Convert to the much saner new idr interface.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Alex Dubov <oakad@yahoo.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/tifm_core.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/misc/tifm_core.c b/drivers/misc/tifm_core.c index 0bd5349b0422..0ab7c922212c 100644 --- a/drivers/misc/tifm_core.c +++ b/drivers/misc/tifm_core.c @@ -196,13 +196,14 @@ int tifm_add_adapter(struct tifm_adapter *fm) { int rc; - if (!idr_pre_get(&tifm_adapter_idr, GFP_KERNEL)) - return -ENOMEM; - + idr_preload(GFP_KERNEL); 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); - if (rc) + idr_preload_end(); + if (rc < 0) return rc; dev_set_name(&fm->dev, "tifm%u", fm->id); |