UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

thermal: convert to idr_alloc() 

Convert to the much saner new idr interface.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Zhang Rui <rui.zhang@intel.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:46 -08:00 committed by Linus Torvalds
parent ab51603672
commit 6deb69face
2 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/thermal/cpu_cooling.c
View File

@ -73,21 +73,14 @@ static struct cpufreq_cooling_device *notify_device;
*/ */
static int get_idr(struct idr *idr, int *id) static int get_idr(struct idr *idr, int *id)
{ {
int err; int ret;
again:
if (unlikely(idr_pre_get(idr, GFP_KERNEL) == 0))
return -ENOMEM;
mutex_lock(&cooling_cpufreq_lock); mutex_lock(&cooling_cpufreq_lock);
err = idr_get_new(idr, NULL, id); ret = idr_alloc(idr, NULL, 0, 0, GFP_KERNEL);
mutex_unlock(&cooling_cpufreq_lock); mutex_unlock(&cooling_cpufreq_lock);
if (unlikely(ret < 0))
if (unlikely(err == -EAGAIN)) return ret;
goto again; *id = ret;
else if (unlikely(err))
return err;
*id = *id & MAX_IDR_MASK;
return 0; return 0;
} }

17
drivers/thermal/thermal_sys.c
View File

@ -132,23 +132,16 @@ EXPORT_SYMBOL_GPL(thermal_unregister_governor);
static int get_idr(struct idr *idr, struct mutex *lock, int *id) static int get_idr(struct idr *idr, struct mutex *lock, int *id)
{ {
int err; int ret;
again:
if (unlikely(idr_pre_get(idr, GFP_KERNEL) == 0))
return -ENOMEM;
if (lock) if (lock)
mutex_lock(lock); mutex_lock(lock);
err = idr_get_new(idr, NULL, id); ret = idr_alloc(idr, NULL, 0, 0, GFP_KERNEL);
if (lock) if (lock)
mutex_unlock(lock); mutex_unlock(lock);
if (unlikely(err == -EAGAIN)) if (unlikely(ret < 0))
goto again; return ret;
else if (unlikely(err)) *id = ret;
return err;
*id = *id & MAX_IDR_MASK;
return 0; return 0;
} }