Commit 2a992413 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Dmitry Torokhov

Input: remove usage of the deprecated ida_simple_xx() API

ida_alloc() and ida_free() should be preferred to the deprecated
ida_simple_get() and ida_simple_remove().

Note that the upper limit of ida_simple_get() is exclusive, but the one of
ida_alloc_range() is inclusive. So a -1 has been added when needed.
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/a885de14beead2cc3c1c946f192b8b178dac696a.1705349930.git.christophe.jaillet@wanadoo.frSigned-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent bc499618
...@@ -2629,17 +2629,15 @@ int input_get_new_minor(int legacy_base, unsigned int legacy_num, ...@@ -2629,17 +2629,15 @@ int input_get_new_minor(int legacy_base, unsigned int legacy_num,
* locking is needed here. * locking is needed here.
*/ */
if (legacy_base >= 0) { if (legacy_base >= 0) {
int minor = ida_simple_get(&input_ida, int minor = ida_alloc_range(&input_ida, legacy_base,
legacy_base, legacy_base + legacy_num - 1,
legacy_base + legacy_num, GFP_KERNEL);
GFP_KERNEL);
if (minor >= 0 || !allow_dynamic) if (minor >= 0 || !allow_dynamic)
return minor; return minor;
} }
return ida_simple_get(&input_ida, return ida_alloc_range(&input_ida, INPUT_FIRST_DYNAMIC_DEV,
INPUT_FIRST_DYNAMIC_DEV, INPUT_MAX_CHAR_DEVICES, INPUT_MAX_CHAR_DEVICES - 1, GFP_KERNEL);
GFP_KERNEL);
} }
EXPORT_SYMBOL(input_get_new_minor); EXPORT_SYMBOL(input_get_new_minor);
...@@ -2652,7 +2650,7 @@ EXPORT_SYMBOL(input_get_new_minor); ...@@ -2652,7 +2650,7 @@ EXPORT_SYMBOL(input_get_new_minor);
*/ */
void input_free_minor(unsigned int minor) void input_free_minor(unsigned int minor)
{ {
ida_simple_remove(&input_ida, minor); ida_free(&input_ida, minor);
} }
EXPORT_SYMBOL(input_free_minor); EXPORT_SYMBOL(input_free_minor);
......
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