Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-04 04:06:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pps: convert to idr_alloc()

Browse Source 
Convert to the much saner new idr interface.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Rodolfo Giometti <giometti@enneenne.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Tejun Heo 2013-02-27 17:04:38 -08:00 committed by Linus Torvalds
parent 05e2cefab4
commit 19dd2da3b4
2 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pps/kapi.c
View File

@ -102,7 +102,7 @@ struct pps_device *pps_register_source(struct pps_source_info *info,
goto pps_register_source_exit; goto pps_register_source_exit;
} }
/* These initializations must be done before calling idr_get_new() /* These initializations must be done before calling idr_alloc()
* in order to avoid reces into pps_event(). * in order to avoid reces into pps_event().
*/ */
pps->params.api_version = PPS_API_VERS; pps->params.api_version = PPS_API_VERS;

36
drivers/pps/pps.c
View File

@ -295,29 +295,21 @@ int pps_register_cdev(struct pps_device *pps)
dev_t devt; dev_t devt;
mutex_lock(&pps_idr_lock); mutex_lock(&pps_idr_lock);
/* Get new ID for the new PPS source */ /*
if (idr_pre_get(&pps_idr, GFP_KERNEL) == 0) { * Get new ID for the new PPS source. After idr_alloc() calling
mutex_unlock(&pps_idr_lock); * the new source will be freely available into the kernel.
return -ENOMEM;
}
/* Now really allocate the PPS source.
* After idr_get_new() calling the new source will be freely available
* into the kernel.
*/ */
err = idr_get_new(&pps_idr, pps, &pps->id); err = idr_alloc(&pps_idr, pps, 0, PPS_MAX_SOURCES, GFP_KERNEL);
mutex_unlock(&pps_idr_lock); if (err < 0) {
if (err == -ENOSPC) {
if (err < 0) pr_err("%s: too many PPS sources in the system\n",
return err; pps->info.name);
err = -EBUSY;
pps->id &= MAX_IDR_MASK; }
if (pps->id >= PPS_MAX_SOURCES) { goto out_unlock;
pr_err("%s: too many PPS sources in the system\n",
pps->info.name);
err = -EBUSY;
goto free_idr;
} }
pps->id = err;
mutex_unlock(&pps_idr_lock);
devt = MKDEV(MAJOR(pps_devt), pps->id); devt = MKDEV(MAJOR(pps_devt), pps->id);
@ -351,8 +343,8 @@ int pps_register_cdev(struct pps_device *pps)
free_idr: free_idr:
mutex_lock(&pps_idr_lock); mutex_lock(&pps_idr_lock);
idr_remove(&pps_idr, pps->id); idr_remove(&pps_idr, pps->id);
out_unlock:
mutex_unlock(&pps_idr_lock); mutex_unlock(&pps_idr_lock);
return err; return err;
} }