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: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/a885de14beead2cc3c1c946f192b8b178dac696a.1705349930.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/input.c b/drivers/input/input.c
index f71ea4fb173fdd2950cd6a271e1975e930578ce1..de7884a5be39bc60c1b70fea90eb87e528120d8d 100644 (file)
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -2629,17 +2629,15 @@ int input_get_new_minor(int legacy_base, unsigned int legacy_num,
         * locking is needed here.
         */
        if (legacy_base >= 0) {
-               int minor = ida_simple_get(&input_ida,
-                                          legacy_base,
-                                          legacy_base + legacy_num,
-                                          GFP_KERNEL);
+               int minor = ida_alloc_range(&input_ida, legacy_base,
+                                           legacy_base + legacy_num - 1,
+                                           GFP_KERNEL);
                if (minor >= 0 || !allow_dynamic)
                        return minor;
        }
 
-       return ida_simple_get(&input_ida,
-                             INPUT_FIRST_DYNAMIC_DEV, INPUT_MAX_CHAR_DEVICES,
-                             GFP_KERNEL);
+       return ida_alloc_range(&input_ida, INPUT_FIRST_DYNAMIC_DEV,
+                              INPUT_MAX_CHAR_DEVICES - 1, GFP_KERNEL);
 }
 EXPORT_SYMBOL(input_get_new_minor);
 
@@ -2652,7 +2650,7 @@ EXPORT_SYMBOL(input_get_new_minor);
  */
 void input_free_minor(unsigned int minor)
 {
-       ida_simple_remove(&input_ida, minor);
+       ida_free(&input_ida, minor);
 }
 EXPORT_SYMBOL(input_free_minor);