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:
parent
ab51603672
commit
6deb69face
|
@ -73,21 +73,14 @@ static struct cpufreq_cooling_device *notify_device;
|
|||
*/
|
||||
static int get_idr(struct idr *idr, int *id)
|
||||
{
|
||||
int err;
|
||||
again:
|
||||
if (unlikely(idr_pre_get(idr, GFP_KERNEL) == 0))
|
||||
return -ENOMEM;
|
||||
int ret;
|
||||
|
||||
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);
|
||||
|
||||
if (unlikely(err == -EAGAIN))
|
||||
goto again;
|
||||
else if (unlikely(err))
|
||||
return err;
|
||||
|
||||
*id = *id & MAX_IDR_MASK;
|
||||
if (unlikely(ret < 0))
|
||||
return ret;
|
||||
*id = ret;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -132,23 +132,16 @@ EXPORT_SYMBOL_GPL(thermal_unregister_governor);
|
|||
|
||||
static int get_idr(struct idr *idr, struct mutex *lock, int *id)
|
||||
{
|
||||
int err;
|
||||
|
||||
again:
|
||||
if (unlikely(idr_pre_get(idr, GFP_KERNEL) == 0))
|
||||
return -ENOMEM;
|
||||
int ret;
|
||||
|
||||
if (lock)
|
||||
mutex_lock(lock);
|
||||
err = idr_get_new(idr, NULL, id);
|
||||
ret = idr_alloc(idr, NULL, 0, 0, GFP_KERNEL);
|
||||
if (lock)
|
||||
mutex_unlock(lock);
|
||||
if (unlikely(err == -EAGAIN))
|
||||
goto again;
|
||||
else if (unlikely(err))
|
||||
return err;
|
||||
|
||||
*id = *id & MAX_IDR_MASK;
|
||||
if (unlikely(ret < 0))
|
||||
return ret;
|
||||
*id = ret;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user